attempt to put things in a sane package