Started improving the naming
Moved all the servlets into their own package.
More rejigging. Currently lots of compile errors (in IntelliJ only). About to invalidate cache.
Moved some classes, did a bit of reformatting.
Corrected (non)running tests.