simplify, remove hardcoded dirs, dir paths point to top level var