issue #22 little package refactoring