Prettied up the folder structure

We don't want a lot of stray files floating around to ease upgrades &
reinstalls