Overhaul ModStructure Generation.  Closes #61