Restructured the packages of the project.