moved around some organization stuff