More package renaming and refactoring