misc changes related to relocating files
Misc config changes