Moved some classes to different packages and added some comments