Re-organize class