Refactoring: cleaning directories structure