reorganise

• Novocain
• jonquils
• toastmasters
• battle
• crabbier
• stared