Cleanup, move class- to class.
Merge branch 'master' of github.com:ReduxFramework/ReduxFramework