Use modules instead of classes
Merge branch 'master' of github.com:kyoto-project/kyoto