mv'd some files, updated changelot

addresses #1126