diff --git a/src/BaseJoint.cpp b/src/UserInterface/BaseJoint.cpp
similarity index 100%
rename from src/BaseJoint.cpp
rename to src/UserInterface/BaseJoint.cpp
diff --git a/src/BaseJoint.h b/src/UserInterface/BaseJoint.h
similarity index 100%
rename from src/BaseJoint.h
rename to src/UserInterface/BaseJoint.h
diff --git a/src/CircleJoint.cpp b/src/UserInterface/CircleJoint.cpp
similarity index 100%
rename from src/CircleJoint.cpp
rename to src/UserInterface/CircleJoint.cpp
diff --git a/src/CircleJoint.h b/src/UserInterface/CircleJoint.h
similarity index 100%
rename from src/CircleJoint.h
rename to src/UserInterface/CircleJoint.h
diff --git a/src/EditorType.h b/src/UserInterface/EditorType.h
similarity index 100%
rename from src/EditorType.h
rename to src/UserInterface/EditorType.h
diff --git a/src/GuiMode.h b/src/UserInterface/GuiMode.h
similarity index 100%
rename from src/GuiMode.h
rename to src/UserInterface/GuiMode.h
diff --git a/src/ProjectionEditor.cpp b/src/UserInterface/ProjectionEditor.cpp
similarity index 100%
rename from src/ProjectionEditor.cpp
rename to src/UserInterface/ProjectionEditor.cpp
diff --git a/src/ProjectionEditor.h b/src/UserInterface/ProjectionEditor.h
similarity index 100%
rename from src/ProjectionEditor.h
rename to src/UserInterface/ProjectionEditor.h
diff --git a/src/ui/RadioList.cpp b/src/UserInterface/RadioList.cpp
similarity index 100%
rename from src/ui/RadioList.cpp
rename to src/UserInterface/RadioList.cpp
diff --git a/src/ui/RadioList.h b/src/UserInterface/RadioList.h
similarity index 100%
rename from src/ui/RadioList.h
rename to src/UserInterface/RadioList.h
diff --git a/src/SourcesEditor.cpp b/src/UserInterface/SourcesEditor.cpp
similarity index 100%
rename from src/SourcesEditor.cpp
rename to src/UserInterface/SourcesEditor.cpp
diff --git a/src/SourcesEditor.h b/src/UserInterface/SourcesEditor.h
similarity index 100%
rename from src/SourcesEditor.h
rename to src/UserInterface/SourcesEditor.h
diff --git a/src/TextureEditor.cpp b/src/UserInterface/TextureEditor.cpp
similarity index 100%
rename from src/TextureEditor.cpp
rename to src/UserInterface/TextureEditor.cpp
diff --git a/src/TextureEditor.h b/src/UserInterface/TextureEditor.h
similarity index 100%
rename from src/TextureEditor.h
rename to src/UserInterface/TextureEditor.h