moving submodules
moving some stuff around to keep the top level a bit cleaner