Refactored how packages are handled.
Cleaning up fonts