Revert "Fix bug with missing folder and close issue #0"

This reverts commit b799a1818f60e075ad40fd901d9a0a68e2f155cf.