moved some classes outside main file, cleaned up plot scripts