Moving style-relates files around

@iwillig @meetar just moving some things into their own files and classes... no functionality changes here.