issue #62 refactor: packages and classes rename