- Cleaned up packages.
- Removed unused classes.