Layed out the basic structure
Moved everything into a basic order
Tidy up