Directories reorganization