Update structure to match project structure best practices