second whack at reorganizing org