updated package names and locations with ones more in-line with industry
standards.