Mostly file name changes and minor refactoring.
Merge branch 'master' of https://github.com/robin5/DemiTasse