Restructuring files
Fixing symlinks