feat: Update design and structure for new schema format