#7 refactoring package and class name