Directories simplification