Updated reader folder and package structure to be the same.