moved files to one/ subfolder
made new code and some tests for it: unit and integration