Move things around a bit to get travis working