No current folder creation on setup
Removing if real folder
Fixed patch and added tests
Merge pull request #347 from zupolgec/patch-structure-creation

No current folder creation on setup