Moving stuff to submodule