Little reorganizing in preperation for new hierarchy