updated package names and locations with ones more in-line with industry
standards.
Merge branch 'dev' of https://github.com/clanier9/OPengine.git into dev