Refactoring of compile units names to better reflect project structure