added Directories util
- that is probably unneeded :D
- some minor var renames in an attempt to improve readability
- added tests for the new util