Restructure class names and style selections Break out styles in to their own file