Refactored all names of packages to follow convention.