reorganized files and edit sample