Moved to project instead of module model
Added dependent submodules
Finished updating project (will now build)