Normalizing demo structure