Rebuilding directories, again...