Starting move over to submodules