Finished the split up of LightReader