Refactoring Name.java into the proper package