Moving items around to better support this as a submodule