Refactoring classes

Because the new code and the deprecated code both output classes, the css was being output twice :blush: 

Moving the classes into one file enables me to check if they've already been output by the deprecated code before doing it all again...