Refactoring
Changed package hierarchy