diff --git a/src/Component.bf b/src/Core/Component.bf
similarity index 100%
rename from src/Component.bf
rename to src/Core/Component.bf
diff --git a/src/Entity.bf b/src/Core/Entity.bf
similarity index 100%
rename from src/Entity.bf
rename to src/Core/Entity.bf
diff --git a/src/Game.bf b/src/Core/Game.bf
similarity index 100%
rename from src/Game.bf
rename to src/Core/Game.bf
diff --git a/src/Scene.bf b/src/Core/Scene.bf
similarity index 100%
rename from src/Scene.bf
rename to src/Core/Scene.bf
diff --git a/src/Util/Calc.bf b/src/Static/Calc.bf
similarity index 100%
rename from src/Util/Calc.bf
rename to src/Static/Calc.bf
diff --git a/src/Util/Draw.bf b/src/Static/Draw.bf
similarity index 100%
rename from src/Util/Draw.bf
rename to src/Static/Draw.bf
diff --git a/src/Util/Time.bf b/src/Static/Time.bf
similarity index 100%
rename from src/Util/Time.bf
rename to src/Static/Time.bf
diff --git a/src/Util/Color.bf b/src/Struct/Color.bf
similarity index 100%
rename from src/Util/Color.bf
rename to src/Struct/Color.bf
diff --git a/src/Util/Point.bf b/src/Struct/Point.bf
similarity index 100%
rename from src/Util/Point.bf
rename to src/Struct/Point.bf
diff --git a/src/Util/Rect.bf b/src/Struct/Rect.bf
similarity index 100%
rename from src/Util/Rect.bf
rename to src/Struct/Rect.bf
diff --git a/src/Util/Vector.bf b/src/Struct/Vector.bf
similarity index 100%
rename from src/Util/Vector.bf
rename to src/Struct/Vector.bf