Package declarations in each class changed to match new package names