Fixed demo mode bug.
Renamed to Warehouse. Tidied up a few files.