Made some Rx-related classes package-private