Updated more files for move to org.
Merge pull request #30 from fix8/master

Updated more files for move to org.