Cleanup and package name change.