renaming packages
fixing pacakge issues