bug fix
moved to subfolder
mostly UI work