Moved user interface related stuff to separate folder
Merge branch 'folder'