refactoring directories structure