Restructuring of CSS