HouseKeeping

I moved some of the new models into their folders.