renaming pacakge, removing unused ones.