Refactoring packages

Tidied code base up - moved classes into appropriate packages (instead
of sitting in root).  Removed a couple of classes that were no longer
being used