Directory tidyup, everything in root now