started refactoring project ui infrastructure