CSS classes restructure