Revert "Revert "Rebuilt the structure so we can hopefully import. May need to rollback if it breaks things.""

This reverts commit de764843cf164b2f547f3386e4ea6683ecd86710.
Trying to revert revert