improved structure of UI project