further fixes post merge with master
Removed folder creation as part of merge. 
This change was originally in commit
39d09117712658bf4085e5f88837838ad8a2a4b3.