moved around and renamed a bunch of classes, cleaning up

working on partitioning

working on fixing the event data reader