reorganizing packages to make sense