Re made the UI projects with better naming conventions