Refactored classes in to different package