Move some stuff that was explicitly included into submodules
Whoops forgot about this file