rename packages and change method visibilities