Don't need submodules anymore (whew)!