Moving things around, to get a nicer package