Organization and item fix.