General Tidy

-Re-structured hierarchy
- Renamed things - _demo is now scene name.
-General Tidy up