Move structure around to better suit use as a submodule