Hotfix/issue 27

- [x] Directories are now specified in URI format
- [x] Tests updated