Renaming
Slight changes
Added a Category class
Merge branch 'master' into site-integration.