refactoring packages
refactoring packages
removed duplication code from UiController