Refactored some package names and modified dependencies.