Cleanup and package renaming