[various] A little reorganization