reorganizing for make-it-so