Move unpackaged files to appropriate places #3638
Add changelog entry #3638