Begin to change API for directory path retrieval (will probably be shortly changed further however!)
Reorder and clarify todos