Restructured the projects various packages.