Make packages more readable