first whack at reorganizing org