Restructuring
First run at smoke tests.

* Need full cleanup, site query.
* is using HAWK, so I can test that bit.