fixing package names of a few classes