Removed garbage.
Renamed packages for easier understanding
Deleted old packages
Less garbage. Fixed links to renamed packages