Package renaming; mild moving of classes