refactoring + samples renaming
Testing and sampling