package names

changed the package names to conform to Google standards