Moving 'DataStructure' into a submodule