rearrange directory structure and clean up printing

darn it, I can't get it to compile with the bcell-specific stuff in its
own directory. *sigh*