reorganized files, adding ui