Rearranged the local repository to get everything in the right place

This allowed the import script to just pull one top level directory each