Updated file structure so UI has its own namespace