More clean up of the code; mostly moving things around into a classData
directory and some into the logs directory