Moving UI stuff to UI folder and UI group