Moving things about into public/