Refactoring
Changed Package hierarchy