Update dataset related code and directory structure for Models