Project tidy up - moved classes to directories on disk