Refactoring. New UI-package that contains the layout