Restructured and added a stub class of datareaderwriter