Package renaming and various tweaks