Refactoring. Moved readers onto a different package.