Changes to structure for building from submodule