First attempt
Cleaning up packages