Small refactorings - package renaming.