works without copying dir structure
Merge branch 'dev'