Initial code changes for structure.