rearrange dependencies on abort module