Rearranged packages to make the naming more consistant