apply consistent file naming conventions in src code
Merge branch 'master' of https://github.com/jmeinken/master-the-jouyou