Reorganize project structure in preparation for making this webscale ;-)