Restructure repository to use as a submodule