Restructuring badges