Dir refactor
Path fixes
Refactor
Added dir watching