naming cleanup and package refactoring