Remove subprojects
Re-added subprojects as submodules
Split sub-projects into their own sub-modules

Merge branch 'split_out_submodules'