More moving around related files.