Merged ModelReaderFactory and ModelReader into ModelReader.

ModelReader implements the interfaces PropertyReader and PropertyReaderFactory.