Heavy changes to the directory structure.