Deleted stuffs
Moved everything up a level- David