Major cleanup
- Removed unused packages
- Renamed  some packages
- Removed unused classes