Change things into submodules