Restructuring layout CSS to true MCSS