Re-creating with better structure.