Refactored packages. Moved lots of classes.