Changing the structure to work outside of a submodule