develop
Made data modules, fixed other issues according to code review
Fix analysis errors: restore Either class, fix imports, and cleanup unused imports