Change samples dir
Refactor files