Moving more things around for travis compatibility.