Split project in two and added robustness to traversal