diff --git a/TODO.txt b/doc/TODO.txt
similarity index 100%
rename from TODO.txt
rename to doc/TODO.txt
diff --git a/checklist-macosx.txt b/doc/checklist-macosx.txt
similarity index 100%
rename from checklist-macosx.txt
rename to doc/checklist-macosx.txt
diff --git a/OpenSCAD.icns b/icons/OpenSCAD.icns
similarity index 100%
rename from OpenSCAD.icns
rename to icons/OpenSCAD.icns
diff --git a/icon-alpha.png b/icons/icon-alpha.png
similarity index 100%
rename from icon-alpha.png
rename to icons/icon-alpha.png
diff --git a/icon.png b/icons/icon.png
similarity index 100%
rename from icon.png
rename to icons/icon.png
diff --git a/mask.png b/icons/mask.png
similarity index 100%
rename from mask.png
rename to icons/mask.png
diff --git a/openscad.ico b/icons/openscad.ico
similarity index 100%
rename from openscad.ico
rename to icons/openscad.ico
diff --git a/prefs3DView.png b/icons/prefs3DView.png
similarity index 100%
rename from prefs3DView.png
rename to icons/prefs3DView.png
diff --git a/prefsAdvanced.png b/icons/prefsAdvanced.png
similarity index 100%
rename from prefsAdvanced.png
rename to icons/prefsAdvanced.png
diff --git a/prefsEditor.png b/icons/prefsEditor.png
similarity index 100%
rename from prefsEditor.png
rename to icons/prefsEditor.png
diff --git a/CGAL-OGL-Tess-Combine-Fix.patch b/patches/CGAL-OGL-Tess-Combine-Fix.patch
similarity index 100%
rename from CGAL-OGL-Tess-Combine-Fix.patch
rename to patches/CGAL-OGL-Tess-Combine-Fix.patch
diff --git a/CGAL-Valgrind-Enable-Hack.patch b/patches/CGAL-Valgrind-Enable-Hack.patch
similarity index 100%
rename from CGAL-Valgrind-Enable-Hack.patch
rename to patches/CGAL-Valgrind-Enable-Hack.patch
diff --git a/OpenCSG-1.1.0-Reset-Hack.patch b/patches/OpenCSG-1.1.0-Reset-Hack.patch
similarity index 100%
rename from OpenCSG-1.1.0-Reset-Hack.patch
rename to patches/OpenCSG-1.1.0-Reset-Hack.patch
diff --git a/OpenCSG-1.1.1-MacOSX-port.patch b/patches/OpenCSG-1.1.1-MacOSX-port.patch
similarity index 100%
rename from OpenCSG-1.1.1-MacOSX-port.patch
rename to patches/OpenCSG-1.1.1-MacOSX-port.patch
diff --git a/OpenCSG-1.2.0-MacOSX-port.patch b/patches/OpenCSG-1.2.0-MacOSX-port.patch
similarity index 100%
rename from OpenCSG-1.2.0-MacOSX-port.patch
rename to patches/OpenCSG-1.2.0-MacOSX-port.patch
diff --git a/OpenCSG-1.2.0-Reset-Hack.patch b/patches/OpenCSG-1.2.0-Reset-Hack.patch
similarity index 100%
rename from OpenCSG-1.2.0-Reset-Hack.patch
rename to patches/OpenCSG-1.2.0-Reset-Hack.patch
diff --git a/publish-macosx.sh b/scripts/publish-macosx.sh
similarity index 100%
rename from publish-macosx.sh
rename to scripts/publish-macosx.sh
diff --git a/release-common.sh b/scripts/release-common.sh
similarity index 100%
rename from release-common.sh
rename to scripts/release-common.sh
diff --git a/release-linux.sh b/scripts/release-linux.sh
similarity index 100%
rename from release-linux.sh
rename to scripts/release-linux.sh
diff --git a/release-macosx.sh b/scripts/release-macosx.sh
similarity index 100%
rename from release-macosx.sh
rename to scripts/release-macosx.sh
diff --git a/release-win32.sh b/scripts/release-win32.sh
similarity index 100%
rename from release-win32.sh
rename to scripts/release-win32.sh
diff --git a/CGAL_renderer.h b/src/CGAL_renderer.h
similarity index 100%
rename from CGAL_renderer.h
rename to src/CGAL_renderer.h
diff --git a/EventFilter.h b/src/EventFilter.h
similarity index 100%
rename from EventFilter.h
rename to src/EventFilter.h
diff --git a/GLView.h b/src/GLView.h
similarity index 100%
rename from GLView.h
rename to src/GLView.h
diff --git a/MainWindow.h b/src/MainWindow.h
similarity index 100%
rename from MainWindow.h
rename to src/MainWindow.h
diff --git a/Preferences.cc b/src/Preferences.cc
similarity index 100%
rename from Preferences.cc
rename to src/Preferences.cc
diff --git a/Preferences.h b/src/Preferences.h
similarity index 100%
rename from Preferences.h
rename to src/Preferences.h
diff --git a/context.cc b/src/context.cc
similarity index 100%
rename from context.cc
rename to src/context.cc
diff --git a/control.cc b/src/control.cc
similarity index 100%
rename from control.cc
rename to src/control.cc
diff --git a/csgops.cc b/src/csgops.cc
similarity index 100%
rename from csgops.cc
rename to src/csgops.cc
diff --git a/csgterm.cc b/src/csgterm.cc
similarity index 100%
rename from csgterm.cc
rename to src/csgterm.cc
diff --git a/dxfdata.cc b/src/dxfdata.cc
similarity index 100%
rename from dxfdata.cc
rename to src/dxfdata.cc
diff --git a/dxfdim.cc b/src/dxfdim.cc
similarity index 100%
rename from dxfdim.cc
rename to src/dxfdim.cc
diff --git a/dxflinextrude.cc b/src/dxflinextrude.cc
similarity index 100%
rename from dxflinextrude.cc
rename to src/dxflinextrude.cc
diff --git a/dxfrotextrude.cc b/src/dxfrotextrude.cc
similarity index 100%
rename from dxfrotextrude.cc
rename to src/dxfrotextrude.cc
diff --git a/dxftess-cgal.cc b/src/dxftess-cgal.cc
similarity index 100%
rename from dxftess-cgal.cc
rename to src/dxftess-cgal.cc
diff --git a/dxftess-glu.cc b/src/dxftess-glu.cc
similarity index 100%
rename from dxftess-glu.cc
rename to src/dxftess-glu.cc
diff --git a/dxftess.cc b/src/dxftess.cc
similarity index 100%
rename from dxftess.cc
rename to src/dxftess.cc
diff --git a/export.cc b/src/export.cc
similarity index 100%
rename from export.cc
rename to src/export.cc
diff --git a/expr.cc b/src/expr.cc
similarity index 100%
rename from expr.cc
rename to src/expr.cc
diff --git a/func.cc b/src/func.cc
similarity index 100%
rename from func.cc
rename to src/func.cc
diff --git a/glview.cc b/src/glview.cc
similarity index 100%
rename from glview.cc
rename to src/glview.cc
diff --git a/highlighter.cc b/src/highlighter.cc
similarity index 100%
rename from highlighter.cc
rename to src/highlighter.cc
diff --git a/import.cc b/src/import.cc
similarity index 100%
rename from import.cc
rename to src/import.cc
diff --git a/mainwin.cc b/src/mainwin.cc
similarity index 100%
rename from mainwin.cc
rename to src/mainwin.cc
diff --git a/module.cc b/src/module.cc
similarity index 100%
rename from module.cc
rename to src/module.cc
diff --git a/nef2dxf.cc b/src/nef2dxf.cc
similarity index 100%
rename from nef2dxf.cc
rename to src/nef2dxf.cc
diff --git a/openscad.cc b/src/openscad.cc
similarity index 100%
rename from openscad.cc
rename to src/openscad.cc
diff --git a/openscad.h b/src/openscad.h
similarity index 100%
rename from openscad.h
rename to src/openscad.h
diff --git a/polyset.cc b/src/polyset.cc
similarity index 100%
rename from polyset.cc
rename to src/polyset.cc
diff --git a/primitives.cc b/src/primitives.cc
similarity index 100%
rename from primitives.cc
rename to src/primitives.cc
diff --git a/printutils.cc b/src/printutils.cc
similarity index 100%
rename from printutils.cc
rename to src/printutils.cc
diff --git a/printutils.h b/src/printutils.h
similarity index 100%
rename from printutils.h
rename to src/printutils.h
diff --git a/qtcolorbutton/README.txt b/src/qtcolorbutton/README.txt
similarity index 100%
rename from qtcolorbutton/README.txt
rename to src/qtcolorbutton/README.txt
diff --git a/qtcolorbutton/qtcolorbutton.cpp b/src/qtcolorbutton/qtcolorbutton.cpp
similarity index 100%
rename from qtcolorbutton/qtcolorbutton.cpp
rename to src/qtcolorbutton/qtcolorbutton.cpp
diff --git a/qtcolorbutton/qtcolorbutton.h b/src/qtcolorbutton/qtcolorbutton.h
similarity index 100%
rename from qtcolorbutton/qtcolorbutton.h
rename to src/qtcolorbutton/qtcolorbutton.h
diff --git a/qtcolorbutton/qtcolorbutton.pri b/src/qtcolorbutton/qtcolorbutton.pri
similarity index 100%
rename from qtcolorbutton/qtcolorbutton.pri
rename to src/qtcolorbutton/qtcolorbutton.pri
diff --git a/render.cc b/src/render.cc
similarity index 100%
rename from render.cc
rename to src/render.cc
diff --git a/surface.cc b/src/surface.cc
similarity index 100%
rename from surface.cc
rename to src/surface.cc
diff --git a/transform.cc b/src/transform.cc
similarity index 100%
rename from transform.cc
rename to src/transform.cc
diff --git a/value.cc b/src/value.cc
similarity index 100%
rename from value.cc
rename to src/value.cc