Fixed all the package names

Package names were not refactored