Organize packages better