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

This reverts commit d4e08d077a4aea84261ce0714b61393f5950ef4d.