Cleanup and package name change.
Merge branch 'Jake_Dev'