A little reorganizing is in order…