#14 #21 #22 Work with borschik by API and best folders tree making
Merge branch 'feature/issue@21'