accidently deleted source replaced

Accidently deleted source files, then made changes in development copy,
Replaced the source files with the minor changed files in development
copy
Revert "accidently deleted source replaced"

This reverts commit d5e6120d4145be250e783cc2536d48ebb4b062a2.