Refactored package and class names.

Added/Removed some packages
Fixed imports
Moved some classes around