Restructure to allow repository to be a submodule