Issue #20 : Refactoring packages