Rearranging files for merge
Updating doc files for merge