diff --git a/packages/wolf_3d_engine/lib/src/engine_audio.dart b/packages/wolf_3d_engine/lib/src/audio/engine_audio.dart
similarity index 100%
rename from packages/wolf_3d_engine/lib/src/engine_audio.dart
rename to packages/wolf_3d_engine/lib/src/audio/engine_audio.dart
diff --git a/packages/wolf_3d_engine/lib/src/silent_renderer.dart b/packages/wolf_3d_engine/lib/src/audio/silent_renderer.dart
similarity index 100%
rename from packages/wolf_3d_engine/lib/src/silent_renderer.dart
rename to packages/wolf_3d_engine/lib/src/audio/silent_renderer.dart
diff --git a/packages/wolf_3d_engine/lib/src/engine_input.dart b/packages/wolf_3d_engine/lib/src/input/engine_input.dart
similarity index 100%
rename from packages/wolf_3d_engine/lib/src/engine_input.dart
rename to packages/wolf_3d_engine/lib/src/input/engine_input.dart
diff --git a/packages/wolf_3d_engine/lib/src/ascii_rasterizer.dart b/packages/wolf_3d_engine/lib/src/rasterizer/ascii_rasterizer.dart
similarity index 100%
rename from packages/wolf_3d_engine/lib/src/ascii_rasterizer.dart
rename to packages/wolf_3d_engine/lib/src/rasterizer/ascii_rasterizer.dart
diff --git a/packages/wolf_3d_engine/lib/src/rasterizer.dart b/packages/wolf_3d_engine/lib/src/rasterizer/rasterizer.dart
similarity index 100%
rename from packages/wolf_3d_engine/lib/src/rasterizer.dart
rename to packages/wolf_3d_engine/lib/src/rasterizer/rasterizer.dart
diff --git a/packages/wolf_3d_engine/lib/src/software_rasterizer.dart b/packages/wolf_3d_engine/lib/src/rasterizer/software_rasterizer.dart
similarity index 100%
rename from packages/wolf_3d_engine/lib/src/software_rasterizer.dart
rename to packages/wolf_3d_engine/lib/src/rasterizer/software_rasterizer.dart
diff --git a/packages/wolf_3d_engine/lib/wolf_3d_engine.dart b/packages/wolf_3d_engine/lib/wolf_3d_engine.dart
index d3e52a1..e302156 100644
--- a/packages/wolf_3d_engine/lib/wolf_3d_engine.dart
+++ b/packages/wolf_3d_engine/lib/wolf_3d_engine.dart
@@ -3,13 +3,13 @@
 /// More dartdocs go here.
 library;
 
-export 'src/ascii_rasterizer.dart';
-export 'src/engine_audio.dart';
-export 'src/engine_input.dart';
+export 'src/audio/engine_audio.dart';
+export 'src/audio/silent_renderer.dart';
+export 'src/input/engine_input.dart';
 export 'src/managers/door_manager.dart';
 export 'src/managers/pushwall_manager.dart';
 export 'src/player/player.dart';
-export 'src/rasterizer.dart';
-export 'src/silent_renderer.dart';
-export 'src/software_rasterizer.dart';
+export 'src/rasterizer/ascii_rasterizer.dart';
+export 'src/rasterizer/rasterizer.dart';
+export 'src/rasterizer/software_rasterizer.dart';
 export 'src/wolf_3d_engine_base.dart';