Directories refactorated