Reorganized files from robot builder but doesn't work perfectly.