fixing/refactoring path building logic
0.0.7