Refactor: srp
Creates dir if required
Refactor: duplication
Getting back to original