diff --git a/src/Application/ApplicationBaseState.cpp b/src/Application/States/ApplicationBaseState.cpp
similarity index 100%
rename from src/Application/ApplicationBaseState.cpp
rename to src/Application/States/ApplicationBaseState.cpp
diff --git a/src/Application/ApplicationBaseState.h b/src/Application/States/ApplicationBaseState.h
similarity index 100%
rename from src/Application/ApplicationBaseState.h
rename to src/Application/States/ApplicationBaseState.h
diff --git a/src/Application/PresentationState.cpp b/src/Application/States/PresentationState.cpp
similarity index 100%
rename from src/Application/PresentationState.cpp
rename to src/Application/States/PresentationState.cpp
diff --git a/src/Application/PresentationState.h b/src/Application/States/PresentationState.h
similarity index 100%
rename from src/Application/PresentationState.h
rename to src/Application/States/PresentationState.h
diff --git a/src/Application/ProjectionMappingState.cpp b/src/Application/States/ProjectionMappingState.cpp
similarity index 100%
rename from src/Application/ProjectionMappingState.cpp
rename to src/Application/States/ProjectionMappingState.cpp
diff --git a/src/Application/ProjectionMappingState.h b/src/Application/States/ProjectionMappingState.h
similarity index 100%
rename from src/Application/ProjectionMappingState.h
rename to src/Application/States/ProjectionMappingState.h
diff --git a/src/Application/SourceSelectionState.cpp b/src/Application/States/SourceSelectionState.cpp
similarity index 100%
rename from src/Application/SourceSelectionState.cpp
rename to src/Application/States/SourceSelectionState.cpp
diff --git a/src/Application/SourceSelectionState.h b/src/Application/States/SourceSelectionState.h
similarity index 100%
rename from src/Application/SourceSelectionState.h
rename to src/Application/States/SourceSelectionState.h
diff --git a/src/Application/TextureMappingState.cpp b/src/Application/States/TextureMappingState.cpp
similarity index 100%
rename from src/Application/TextureMappingState.cpp
rename to src/Application/States/TextureMappingState.cpp
diff --git a/src/Application/TextureMappingState.h b/src/Application/States/TextureMappingState.h
similarity index 100%
rename from src/Application/TextureMappingState.h
rename to src/Application/States/TextureMappingState.h
diff --git a/src/Application/Gui.cpp b/src/Gui/Gui.cpp
similarity index 100%
rename from src/Application/Gui.cpp
rename to src/Gui/Gui.cpp
diff --git a/src/Application/Gui.h b/src/Gui/Gui.h
similarity index 100%
rename from src/Application/Gui.h
rename to src/Gui/Gui.h
diff --git a/src/Application/GuiBaseWidget.h b/src/Gui/Widgets/GuiBaseWidget.h
similarity index 100%
rename from src/Application/GuiBaseWidget.h
rename to src/Gui/Widgets/GuiBaseWidget.h
diff --git a/src/Application/LayerPanelWidget.cpp b/src/Gui/Widgets/LayerPanelWidget.cpp
similarity index 100%
rename from src/Application/LayerPanelWidget.cpp
rename to src/Gui/Widgets/LayerPanelWidget.cpp
diff --git a/src/Application/LayerPanelWidget.h b/src/Gui/Widgets/LayerPanelWidget.h
similarity index 100%
rename from src/Application/LayerPanelWidget.h
rename to src/Gui/Widgets/LayerPanelWidget.h
diff --git a/src/Application/ScaleWidget.cpp b/src/Gui/Widgets/ScaleWidget.cpp
similarity index 100%
rename from src/Application/ScaleWidget.cpp
rename to src/Gui/Widgets/ScaleWidget.cpp
diff --git a/src/Application/ScaleWidget.h b/src/Gui/Widgets/ScaleWidget.h
similarity index 100%
rename from src/Application/ScaleWidget.h
rename to src/Gui/Widgets/ScaleWidget.h
diff --git a/src/Application/SurfaceHighlightWidget.cpp b/src/Gui/Widgets/SurfaceHighlightWidget.cpp
similarity index 100%
rename from src/Application/SurfaceHighlightWidget.cpp
rename to src/Gui/Widgets/SurfaceHighlightWidget.cpp
diff --git a/src/Application/SurfaceHighlightWidget.h b/src/Gui/Widgets/SurfaceHighlightWidget.h
similarity index 100%
rename from src/Application/SurfaceHighlightWidget.h
rename to src/Gui/Widgets/SurfaceHighlightWidget.h
diff --git a/src/Application/TextureHighlightWidget.cpp b/src/Gui/Widgets/TextureHighlightWidget.cpp
similarity index 100%
rename from src/Application/TextureHighlightWidget.cpp
rename to src/Gui/Widgets/TextureHighlightWidget.cpp
diff --git a/src/Application/TextureHighlightWidget.h b/src/Gui/Widgets/TextureHighlightWidget.h
similarity index 100%
rename from src/Application/TextureHighlightWidget.h
rename to src/Gui/Widgets/TextureHighlightWidget.h