Small config changes and a few files were moved