Lots of renamings.
remove s.
Another try.
Merge pull request #18 from shushu/17

Rename things to thing