Final cleanup: remove excess depth

Moves all files back a folder, which was annoying. Too much depth. Now
we have a clean project.