rename packages, imports to reflect dir structure