move cruft out of top level directory and into extra