small refactoring on directories structure