MODIFIED: the package layout

Re-layouted the packages of the project to properly sub-divide the project.