diff --git a/AbstractGraphicsEngine.cpp b/src/starsphere/AbstractGraphicsEngine.cpp
similarity index 100%
rename from AbstractGraphicsEngine.cpp
rename to src/starsphere/AbstractGraphicsEngine.cpp
diff --git a/AbstractGraphicsEngine.h b/src/starsphere/AbstractGraphicsEngine.h
similarity index 100%
rename from AbstractGraphicsEngine.h
rename to src/starsphere/AbstractGraphicsEngine.h
diff --git a/BOINCClientAdapter.cpp b/src/starsphere/BOINCClientAdapter.cpp
similarity index 100%
rename from BOINCClientAdapter.cpp
rename to src/starsphere/BOINCClientAdapter.cpp
diff --git a/BOINCClientAdapter.h b/src/starsphere/BOINCClientAdapter.h
similarity index 100%
rename from BOINCClientAdapter.h
rename to src/starsphere/BOINCClientAdapter.h
diff --git a/Doxyfile b/src/starsphere/Doxyfile
similarity index 100%
rename from Doxyfile
rename to src/starsphere/Doxyfile
diff --git a/EinsteinS5R3Adapter.cpp b/src/starsphere/EinsteinS5R3Adapter.cpp
similarity index 100%
rename from EinsteinS5R3Adapter.cpp
rename to src/starsphere/EinsteinS5R3Adapter.cpp
diff --git a/EinsteinS5R3Adapter.h b/src/starsphere/EinsteinS5R3Adapter.h
similarity index 100%
rename from EinsteinS5R3Adapter.h
rename to src/starsphere/EinsteinS5R3Adapter.h
diff --git a/GraphicsEngineFactory.cpp b/src/starsphere/GraphicsEngineFactory.cpp
similarity index 100%
rename from GraphicsEngineFactory.cpp
rename to src/starsphere/GraphicsEngineFactory.cpp
diff --git a/GraphicsEngineFactory.h b/src/starsphere/GraphicsEngineFactory.h
similarity index 100%
rename from GraphicsEngineFactory.h
rename to src/starsphere/GraphicsEngineFactory.h
diff --git a/LiberationSans-Regular.ttf b/src/starsphere/LiberationSans-Regular.ttf
similarity index 100%
rename from LiberationSans-Regular.ttf
rename to src/starsphere/LiberationSans-Regular.ttf
diff --git a/Makefile b/src/starsphere/Makefile
similarity index 100%
rename from Makefile
rename to src/starsphere/Makefile
diff --git a/Resource.cpp b/src/starsphere/Resource.cpp
similarity index 100%
rename from Resource.cpp
rename to src/starsphere/Resource.cpp
diff --git a/Resource.h b/src/starsphere/Resource.h
similarity index 100%
rename from Resource.h
rename to src/starsphere/Resource.h
diff --git a/ResourceFactory.cpp b/src/starsphere/ResourceFactory.cpp
similarity index 100%
rename from ResourceFactory.cpp
rename to src/starsphere/ResourceFactory.cpp
diff --git a/ResourceFactory.h b/src/starsphere/ResourceFactory.h
similarity index 100%
rename from ResourceFactory.h
rename to src/starsphere/ResourceFactory.h
diff --git a/Starsphere.cpp b/src/starsphere/Starsphere.cpp
similarity index 100%
rename from Starsphere.cpp
rename to src/starsphere/Starsphere.cpp
diff --git a/Starsphere.h b/src/starsphere/Starsphere.h
similarity index 100%
rename from Starsphere.h
rename to src/starsphere/Starsphere.h
diff --git a/StarsphereS5R3.cpp b/src/starsphere/StarsphereS5R3.cpp
similarity index 100%
rename from StarsphereS5R3.cpp
rename to src/starsphere/StarsphereS5R3.cpp
diff --git a/StarsphereS5R3.h b/src/starsphere/StarsphereS5R3.h
similarity index 100%
rename from StarsphereS5R3.h
rename to src/starsphere/StarsphereS5R3.h
diff --git a/WindowManager.cpp b/src/starsphere/WindowManager.cpp
similarity index 100%
rename from WindowManager.cpp
rename to src/starsphere/WindowManager.cpp
diff --git a/WindowManager.h b/src/starsphere/WindowManager.h
similarity index 100%
rename from WindowManager.h
rename to src/starsphere/WindowManager.h
diff --git a/doc/default/aei_full.png b/src/starsphere/doc/default/aei_full.png
similarity index 100%
rename from doc/default/aei_full.png
rename to src/starsphere/doc/default/aei_full.png
diff --git a/doc/default/footer.html b/src/starsphere/doc/default/footer.html
similarity index 100%
rename from doc/default/footer.html
rename to src/starsphere/doc/default/footer.html
diff --git a/doc/default/header.html b/src/starsphere/doc/default/header.html
similarity index 100%
rename from doc/default/header.html
rename to src/starsphere/doc/default/header.html
diff --git a/doc/default/stylesheet.css b/src/starsphere/doc/default/stylesheet.css
similarity index 100%
rename from doc/default/stylesheet.css
rename to src/starsphere/doc/default/stylesheet.css
diff --git a/main.cpp b/src/starsphere/main.cpp
similarity index 100%
rename from main.cpp
rename to src/starsphere/main.cpp
diff --git a/orc/Makefile b/src/starsphere/orc/Makefile
similarity index 100%
rename from orc/Makefile
rename to src/starsphere/orc/Makefile
diff --git a/orc/ResourceCompiler.cpp b/src/starsphere/orc/ResourceCompiler.cpp
similarity index 100%
rename from orc/ResourceCompiler.cpp
rename to src/starsphere/orc/ResourceCompiler.cpp
diff --git a/orc/ResourceCompiler.h b/src/starsphere/orc/ResourceCompiler.h
similarity index 100%
rename from orc/ResourceCompiler.h
rename to src/starsphere/orc/ResourceCompiler.h
diff --git a/orc/orc.cpp b/src/starsphere/orc/orc.cpp
similarity index 100%
rename from orc/orc.cpp
rename to src/starsphere/orc/orc.cpp
diff --git a/pulsar_list.C b/src/starsphere/pulsar_list.C
similarity index 100%
rename from pulsar_list.C
rename to src/starsphere/pulsar_list.C
diff --git a/resources.orc b/src/starsphere/resources.orc
similarity index 100%
rename from resources.orc
rename to src/starsphere/resources.orc
diff --git a/snr_list.C b/src/starsphere/snr_list.C
similarity index 100%
rename from snr_list.C
rename to src/starsphere/snr_list.C
diff --git a/starlist.C b/src/starsphere/starlist.C
similarity index 100%
rename from starlist.C
rename to src/starsphere/starlist.C