major rehaul of repository structure