Server restructuring and clean up: renamed some packages