Move everything to public