change structure for future-proofing