Improving package organization
Fixing test