Reorganized folders

Moved folders around so I could see what was going on.