Improve paths management
Improve modularity and code reuse