Moving everything to submodules