Re-working class structure