More code reorganization.