should change there folder structure and the reader to match the new module structure
should change there folder structure and the reader to match the new module structure