Re-order StyleManager implementation file to match header