Package renames + refactoring