renamed packages to have a uniform hierarchy