Clean up projects, add submodule projects back in