Mod: Moved reader into its own package.