diff --git a/SConstruct b/SConstruct
index 478a5e201..d676a9a36 100644
--- a/SConstruct
+++ b/SConstruct
@@ -859,9 +859,6 @@ else:
                 'target_pulseaudio',
             ])
         if not GetOption('disable_libvorbis'):
-            env.Append(ROC_TARGETS=[
-                'target_libogg',
-            ])
             env.Append(ROC_TARGETS=[
                 'target_libvorbis',
             ])
diff --git a/src/internal_modules/roc_audio/vorbis_encoder.cpp b/src/internal_modules/roc_audio/target_libvorbis/roc_audio/vorbis_encoder.cpp
similarity index 100%
rename from src/internal_modules/roc_audio/vorbis_encoder.cpp
rename to src/internal_modules/roc_audio/target_libvorbis/roc_audio/vorbis_encoder.cpp
diff --git a/src/internal_modules/roc_audio/vorbis_encoder.h b/src/internal_modules/roc_audio/target_libvorbis/roc_audio/vorbis_encoder.h
similarity index 100%
rename from src/internal_modules/roc_audio/vorbis_encoder.h
rename to src/internal_modules/roc_audio/target_libvorbis/roc_audio/vorbis_encoder.h