breaking things up into a better org