Move files around to support travis builds