move all of these to a submodule