More reorganization - getting closer.