rearranging some things for coveralls