Re-build class structure