Reorg in the attempts to please travis