restructure for coveralls