Bringing everything up to top level so it can be added as a submodule