updated all documentation and scripts to reflect the reorganization o…

…… (#71) * updated all documentation and scripts to reflect the reorganization of the repo * Updated ReadMe with proper paths * updated many areas of the readme to correct typos and to extend several example fields to extend under evaluators. * Updated the mobiledetedgetpu directory to be all lowercase. Corrected several typos in import fields Signed-off-by: Bharath Ramaswamy <quic_bharathr@quicinc.com>
quic · Dec 21, 2022 · f74d559 · f74d559
1 parent c008fc0
commit f74d559
Show file tree

Hide file tree

Showing 123 changed files with 91 additions and 91 deletions.
diff --git a/README.md b/README.md
diff --git a/zoo_tensorflow/Docs/EfficientNetLite.md → ...nsorflow/efficientnet/EfficientNetLite.md b/zoo_tensorflow/Docs/EfficientNetLite.md → ...nsorflow/efficientnet/EfficientNetLite.md
diff --git a/...es/efficientnet/efficientnet_quanteval.py → ...tnet/evaluators/efficientnet_quanteval.py b/...es/efficientnet/efficientnet_quanteval.py → ...tnet/evaluators/efficientnet_quanteval.py
diff --git a/zoo_tensorflow/Docs/MobileDetEdgeTPU.md → ...flow/mobiledetedgetpu/MobileDetEdgeTPU.md b/zoo_tensorflow/Docs/MobileDetEdgeTPU.md → ...flow/mobiledetedgetpu/MobileDetEdgeTPU.md
diff --git a/.../MobileDetEdgeTPU/data_and_model_utils.py → ...dgetpu/evaluators/data_and_model_utils.py b/.../MobileDetEdgeTPU/data_and_model_utils.py → ...dgetpu/evaluators/data_and_model_utils.py
diff --git a/...DetEdgeTPU/mobiledet_edgetpu_quanteval.py → ...evaluators/mobiledet_edgetpu_quanteval.py b/...DetEdgeTPU/mobiledet_edgetpu_quanteval.py → ...evaluators/mobiledet_edgetpu_quanteval.py
diff --git a/zoo_tensorflow/Docs/MobileNetV2.md → zoo_tensorflow/mobilenet_v2/MobileNetV2.md b/zoo_tensorflow/Docs/MobileNetV2.md → zoo_tensorflow/mobilenet_v2/MobileNetV2.md
diff --git a/...obilenet_v2/mobilenet_v2_140_quanteval.py → .../evaluators/mobilenet_v2_140_quanteval.py b/...obilenet_v2/mobilenet_v2_140_quanteval.py → .../evaluators/mobilenet_v2_140_quanteval.py
diff --git a/zoo_tensorflow/Docs/PoseEstimation.md → ...sorflow/pose_estimation/PoseEstimation.md b/zoo_tensorflow/Docs/PoseEstimation.md → ...sorflow/pose_estimation/PoseEstimation.md
diff --git a/...e_estimation/pose_estimation_quanteval.py → ...n/evaluators/pose_estimation_quanteval.py b/...e_estimation/pose_estimation_quanteval.py → ...n/evaluators/pose_estimation_quanteval.py
diff --git a/zoo_tensorflow/Docs/ResNet50.md → zoo_tensorflow/resnet50/ResNet50.md b/zoo_tensorflow/Docs/ResNet50.md → zoo_tensorflow/resnet50/ResNet50.md
diff --git a/...xamples/resnet50/resnet50_v1_quanteval.py → ...net50/evaluators/resnet50_v1_quanteval.py b/...xamples/resnet50/resnet50_v1_quanteval.py → ...net50/evaluators/resnet50_v1_quanteval.py
diff --git a/zoo_tensorflow/Docs/RetinaNet.md → zoo_tensorflow/retinanet/RetinaNet.md b/zoo_tensorflow/Docs/RetinaNet.md → zoo_tensorflow/retinanet/RetinaNet.md
diff --git a/...examples/retinanet/retinanet_quanteval.py → ...tinanet/evaluators/retinanet_quanteval.py b/...examples/retinanet/retinanet_quanteval.py → ...tinanet/evaluators/retinanet_quanteval.py
diff --git a/zoo_tensorflow/Docs/SRGAN.md → zoo_tensorflow/srgan/SRGAN.md b/zoo_tensorflow/Docs/SRGAN.md → zoo_tensorflow/srgan/SRGAN.md
diff --git a/...sorflow/examples/srgan/srgan_quanteval.py → ...rflow/srgan/evaluators/srgan_quanteval.py b/...sorflow/examples/srgan/srgan_quanteval.py → ...rflow/srgan/evaluators/srgan_quanteval.py
diff --git a/zoo_tensorflow/Docs/SSDMobileNetV2.md → ...orflow/ssd_mobilenet_v2/SSDMobileNetV2.md b/zoo_tensorflow/Docs/SSDMobileNetV2.md → ...orflow/ssd_mobilenet_v2/SSDMobileNetV2.md
diff --git a/.../ssd_mobilenet_v2/data_and_model_utils.py → ...net_v2/evaluators/data_and_model_utils.py b/.../ssd_mobilenet_v2/data_and_model_utils.py → ...net_v2/evaluators/data_and_model_utils.py
diff --git a/...obilenet_v2/ssd_mobilenet_v2_quanteval.py → .../evaluators/ssd_mobilenet_v2_quanteval.py b/...obilenet_v2/ssd_mobilenet_v2_quanteval.py → .../evaluators/ssd_mobilenet_v2_quanteval.py
diff --git a/zoo_torch/Docs/Bert.md → zoo_torch/bert/Bert.md b/zoo_torch/Docs/Bert.md → zoo_torch/bert/Bert.md
diff --git a/...rt/transformers_nlclassifier_quanteval.py → ...rs/transformers_nlclassifier_quanteval.py b/...rt/transformers_nlclassifier_quanteval.py → ...rs/transformers_nlclassifier_quanteval.py
diff --git a/...ples/roberta/transformers_qa_quanteval.py → ...t/evaluators/transformers_qa_quanteval.py b/...ples/roberta/transformers_qa_quanteval.py → ...t/evaluators/transformers_qa_quanteval.py
@@ -65,7 +65,7 @@
 OFFICIAL_URL_HEAD="https://github.com/quic/aimet-model-zoo/releases/download/torch_dlv3_w8a8_pc/deeplabv3+w8a8_tfe_perchannel.pth" # To be replaced 
 
 # Utils imports 
-from utils.utils_qa_dataclass import ModelArguments, DataTrainingArguments, AuxArguments
+from zoo_torch.bert.utils.utils_qa_dataclass import ModelArguments, DataTrainingArguments, AuxArguments
 
 os.environ['WANDB_DISABLED']="true"
 

diff --git a/zoo_torch/examples/bert/utils/activations.py → ...orch/bert/evaluators/utils/activations.py b/zoo_torch/examples/bert/utils/activations.py → ...orch/bert/evaluators/utils/activations.py
diff --git a/zoo_torch/examples/bert/utils/trainer_qa.py → ...torch/bert/evaluators/utils/trainer_qa.py b/zoo_torch/examples/bert/utils/trainer_qa.py → ...torch/bert/evaluators/utils/trainer_qa.py
diff --git a/...ert/utils/utils_nlclassifier_dataclass.py → ...ors/utils/utils_nlclassifier_dataclass.py b/...ert/utils/utils_nlclassifier_dataclass.py → ...ors/utils/utils_nlclassifier_dataclass.py
diff --git a/zoo_torch/examples/bert/utils/utils_qa.py → zoo_torch/bert/evaluators/utils/utils_qa.py b/zoo_torch/examples/bert/utils/utils_qa.py → zoo_torch/bert/evaluators/utils/utils_qa.py
diff --git a/...examples/bert/utils/utils_qa_dataclass.py → ...rt/evaluators/utils/utils_qa_dataclass.py b/...examples/bert/utils/utils_qa_dataclass.py → ...rt/evaluators/utils/utils_qa_dataclass.py
diff --git a/...ert/baseline_models/bert/modeling_bert.py → ...els/baseline_models/bert/modeling_bert.py b/...ert/baseline_models/bert/modeling_bert.py → ...els/baseline_models/bert/modeling_bert.py
@@ -40,7 +40,7 @@
 from torch.nn import BCEWithLogitsLoss, CrossEntropyLoss, MSELoss
 
 from aimet_torch import elementwise_ops
-from utils.activations import get_activation
+from zoo_torch.bert.utils.activations import get_activation
 
 from transformers.file_utils import (
     ModelOutput,

diff --git a/zoo_torch/Docs/Classification.md → zoo_torch/classification/Classification.md b/zoo_torch/Docs/Classification.md → zoo_torch/classification/Classification.md
diff --git a/...lassification/classification_quanteval.py → ...on/evaluators/classification_quanteval.py b/...lassification/classification_quanteval.py → ...on/evaluators/classification_quanteval.py
@@ -25,8 +25,8 @@
 
 #AIMET torch related imports
 from aimet_torch.quantsim import QuantizationSimModel
-from zoo_torch.examples.common.image_net_data_loader import ImageNetDataLoader
-from aimet_model_zoo.zoo_torch.common.utils import get_device
+from zoo_torch.common.utils.image_net_data_loader import ImageNetDataLoader
+from zoo_torch.common.utils.utils import get_device
 
 
 QUANTSIM_CONFIG_URL = "https://raw.githubusercontent.com/quic/aimet/release-aimet-1.22.1/TrainingExtensions/common/src/python/aimet_common/quantsim_config/default_config_per_channel.json"

diff --git a/zoo_torch/examples/common/__init__.py → zoo_torch/common/utils/__init__.py b/zoo_torch/examples/common/__init__.py → zoo_torch/common/utils/__init__.py
diff --git a/.../examples/common/image_net_data_loader.py → ...rch/common/utils/image_net_data_loader.py b/.../examples/common/image_net_data_loader.py → ...rch/common/utils/image_net_data_loader.py
diff --git a/zoo_torch/examples/common/utils.py → zoo_torch/common/utils/utils.py b/zoo_torch/examples/common/utils.py → zoo_torch/common/utils/utils.py
diff --git a/zoo_torch/Docs/DeepLabV3.md → zoo_torch/deeplabv3/DeepLabV3.md b/zoo_torch/Docs/DeepLabV3.md → zoo_torch/deeplabv3/DeepLabV3.md
diff --git a/...examples/deeplabv3/deeplabv3_quanteval.py → ...eplabv3/evaluators/deeplabv3_quanteval.py b/...examples/deeplabv3/deeplabv3_quanteval.py → ...eplabv3/evaluators/deeplabv3_quanteval.py
@@ -21,7 +21,7 @@
 from utils.metrics import Evaluator
 from dataloaders import make_data_loader
 from modeling.deeplab import DeepLab
-from zoo_torch.examples.common.utils import get_device
+from zoo_torch.common.utils.utils import get_device
 
 # Torch related imports
 import torch
@@ -183,4 +183,4 @@ def main():
 
 if __name__ == '__main__':
     download_weights()
-    main()
+    main()
diff --git a/zoo_torch/Docs/DeepSpeech2.md → zoo_torch/deepspeech2/DeepSpeech2.md b/zoo_torch/Docs/DeepSpeech2.md → zoo_torch/deepspeech2/DeepSpeech2.md
@@ -19,7 +19,7 @@ export PYTHONPATH=$PYTHONPATH:<path to parent>/aimet-model-zoo
 ```
 
 - Install requirements :  
-`pip install -r aimet-model-zoo/zoo_torch/examples/deepspeech2/requirements.txt`
+`pip install -r aimet-model-zoo/zoo_torch/deepspeech2/evaluators/requirements.txt`
 
 ## Obtain the Test Dataset
 

diff --git a/...ples/deepspeech2/deepspeech2_quanteval.py → ...eech2/evaluators/deepspeech2_quanteval.py b/...ples/deepspeech2/deepspeech2_quanteval.py → ...eech2/evaluators/deepspeech2_quanteval.py
@@ -32,7 +32,7 @@
 from aimet_common.defs import QuantScheme
 from aimet_torch.quantsim import QuantizationSimModel
 
-from zoo_torch.examples.common.utils import get_device
+from zoo_torch.common.utils.utils import get_device
 
 def run_quantsim_evaluation(args):
   device = get_device(args)

diff --git a/...rch/examples/deepspeech2/requirements.txt → ...h/deepspeech2/evaluators/requirements.txt b/...rch/examples/deepspeech2/requirements.txt → ...h/deepspeech2/evaluators/requirements.txt
diff --git a/zoo_torch/Docs/DistilBert.md → zoo_torch/distilbert/DistilBert.md b/zoo_torch/Docs/DistilBert.md → zoo_torch/distilbert/DistilBert.md
diff --git a/...rt/transformers_nlclassifier_quanteval.py → ...rs/transformers_nlclassifier_quanteval.py b/...rt/transformers_nlclassifier_quanteval.py → ...rs/transformers_nlclassifier_quanteval.py
diff --git a/...xamples/bert/transformers_qa_quanteval.py → ...t/evaluators/transformers_qa_quanteval.py b/...xamples/bert/transformers_qa_quanteval.py → ...t/evaluators/transformers_qa_quanteval.py
diff --git a/.../examples/distilbert/utils/activations.py → ...istilbert/evaluators/utils/activations.py b/.../examples/distilbert/utils/activations.py → ...istilbert/evaluators/utils/activations.py
diff --git a/...h/examples/distilbert/utils/trainer_qa.py → ...distilbert/evaluators/utils/trainer_qa.py b/...h/examples/distilbert/utils/trainer_qa.py → ...distilbert/evaluators/utils/trainer_qa.py
diff --git a/...ert/utils/utils_nlclassifier_dataclass.py → ...ors/utils/utils_nlclassifier_dataclass.py b/...ert/utils/utils_nlclassifier_dataclass.py → ...ors/utils/utils_nlclassifier_dataclass.py
diff --git a/...rch/examples/distilbert/utils/utils_qa.py → ...h/distilbert/evaluators/utils/utils_qa.py b/...rch/examples/distilbert/utils/utils_qa.py → ...h/distilbert/evaluators/utils/utils_qa.py
diff --git a/...es/distilbert/utils/utils_qa_dataclass.py → ...rt/evaluators/utils/utils_qa_dataclass.py b/...es/distilbert/utils/utils_qa_dataclass.py → ...rt/evaluators/utils/utils_qa_dataclass.py
diff --git a/..._models/distilbert/modeling_distilbert.py → ..._models/distilbert/modeling_distilbert.py b/..._models/distilbert/modeling_distilbert.py → ..._models/distilbert/modeling_distilbert.py
@@ -38,7 +38,7 @@
 from torch.nn import CrossEntropyLoss
 
 from aimet_torch import elementwise_ops
-from utils.activations import get_activation
+from zoo_torch.distilbert.evaluators.utils.activations import get_activation
 
 from transformers.file_utils import (
     add_code_sample_docstrings,

diff --git a/zoo_torch/Docs/EfficientNet-lite0.md → ...h/efficientnetlite0/EfficientNet-lite0.md b/zoo_torch/Docs/EfficientNet-lite0.md → ...h/efficientnetlite0/EfficientNet-lite0.md
diff --git a/...ntnetlite0/efficientnetlite0_quanteval.py → ...evaluators/efficientnetlite0_quanteval.py b/...ntnetlite0/efficientnetlite0_quanteval.py → ...evaluators/efficientnetlite0_quanteval.py
@@ -29,8 +29,8 @@
 from aimet_torch.quantsim import QuantizationSimModel
 
 # aimet model zoo imports
-from zoo_torch.examples.common import utils
-from zoo_torch.examples.common.image_net_data_loader import ImageNetDataLoader
+from zoo_torch.common.utils import utils
+from zoo_torch.common.utils.image_net_data_loader import ImageNetDataLoader
 
 # ImageNet data loader
 def get_imagenet_dataloader(image_dir, BATCH_SIZE=64):

diff --git a/zoo_torch/Docs/FFNet.md → zoo_torch/ffnet/FFNet.md b/zoo_torch/Docs/FFNet.md → zoo_torch/ffnet/FFNet.md
diff --git a/zoo_torch/examples/ffnet/ffnet_quanteval.py → ...torch/ffnet/evaluators/ffnet_quanteval.py b/zoo_torch/examples/ffnet/ffnet_quanteval.py → ...torch/ffnet/evaluators/ffnet_quanteval.py
@@ -20,7 +20,7 @@
 import urllib.request
 from tqdm import tqdm
 from functools import partial
-from zoo_torch.examples.common.utils import get_device
+from zoo_torch.common.utils.utils import get_device
 
 # Torch related imports
 import torch
@@ -200,4 +200,4 @@ def main(args):
 if __name__ == '__main__':
     args = arguments()
     download_weights(args)
-    main(args)
+    main(args)
diff --git a/zoo_torch/Docs/Hrnet-posenet.md → zoo_torch/hrnet-posenet/Hrnet-posenet.md b/zoo_torch/Docs/Hrnet-posenet.md → zoo_torch/hrnet-posenet/Hrnet-posenet.md
@@ -20,13 +20,13 @@ sudo -H apt-get update
 sudo -H apt-get install ffmpeg
 sudo -H chmod 777 -R <path_to_python_package>/dist-packages/*
 
-cd <path_to_aimet_modelzoo>/zoo_torch/examples
+cd <path_to_aimet_modelzoo>/zoo_torch
 git clone https://github.com/HRNet/HRNet-Human-Pose-Estimation.git
 cd HRNet-Human-Pose-Estimation/
 git checkout 00d7bf72f56382165e504b10ff0dddb82dca6fd2
 cp -r ./lib/ ../hrnet-posenet/
 
-cd zoo_torch/examples/hrnet-posenet/lib
+cd zoo_torch/hrnet-posenet/lib
 make
 ```
 

diff --git a/...rch/examples/hrnet-posenet/_init_paths.py → ...h/hrnet-posenet/evaluators/_init_paths.py b/...rch/examples/hrnet-posenet/_init_paths.py → ...h/hrnet-posenet/evaluators/_init_paths.py
diff --git a/.../hrnet-posenet/hrnet_posenet_quanteval.py → ...net/evaluators/hrnet_posenet_quanteval.py b/.../hrnet-posenet/hrnet_posenet_quanteval.py → ...net/evaluators/hrnet_posenet_quanteval.py
diff --git a/...CO_val2017_detections_AP_H_56_person.json → ...CO_val2017_detections_AP_H_56_person.json b/...CO_val2017_detections_AP_H_56_person.json → ...CO_val2017_detections_AP_H_56_person.json
diff --git a/zoo_torch/examples/hrnet-posenet/hrnet.yaml → zoo_torch/hrnet-posenet/models/hrnet.yaml b/zoo_torch/examples/hrnet-posenet/hrnet.yaml → zoo_torch/hrnet-posenet/models/hrnet.yaml
diff --git a/zoo_torch/Docs/HRNet-w48.md → zoo_torch/hrnet-w48/HRNet-w48.md b/zoo_torch/Docs/HRNet-w48.md → zoo_torch/hrnet-w48/HRNet-w48.md
diff --git a/...examples/hrnet-w48/hrnet-w48_quanteval.py → ...net-w48/evaluators/hrnet-w48_quanteval.py b/...examples/hrnet-w48/hrnet-w48_quanteval.py → ...net-w48/evaluators/hrnet-w48_quanteval.py
@@ -28,7 +28,7 @@
 from aimet_torch.quantsim import QuantizationSimModel
 
 # AIMET model zoo imports
-from zoo_torch.examples.common import utils
+from zoo_torch.common.utils import utils
 
 
 # Get evaluation func to evaluate the model

diff --git a/zoo_torch/Docs/InverseForm.md → zoo_torch/inverseform/InverseForm.md b/zoo_torch/Docs/InverseForm.md → zoo_torch/inverseform/InverseForm.md
diff --git a/...amples/inverseform/inverseform_eval.patch → ...rseform/evaluators/inverseform_eval.patch b/...amples/inverseform/inverseform_eval.patch → ...rseform/evaluators/inverseform_eval.patch
diff --git a/...ples/inverseform/inverseform_quanteval.py → ...eform/evaluators/inverseform_quanteval.py b/...ples/inverseform/inverseform_quanteval.py → ...eform/evaluators/inverseform_quanteval.py
diff --git a/zoo_torch/Docs/MiniLM.md → zoo_torch/minilm/MiniLM.md b/zoo_torch/Docs/MiniLM.md → zoo_torch/minilm/MiniLM.md
diff --git a/...lm/transformers_nlclassifier_quanteval.py → ...rs/transformers_nlclassifier_quanteval.py b/...lm/transformers_nlclassifier_quanteval.py → ...rs/transformers_nlclassifier_quanteval.py
diff --git a/...s/distilbert/transformers_qa_quanteval.py → ...m/evaluators/transformers_qa_quanteval.py b/...s/distilbert/transformers_qa_quanteval.py → ...m/evaluators/transformers_qa_quanteval.py
diff --git a/...orch/examples/minilm/utils/activations.py → ...ch/minilm/evaluators/utils/activations.py b/...orch/examples/minilm/utils/activations.py → ...ch/minilm/evaluators/utils/activations.py
diff --git a/...torch/examples/minilm/utils/trainer_qa.py → ...rch/minilm/evaluators/utils/trainer_qa.py b/...torch/examples/minilm/utils/trainer_qa.py → ...rch/minilm/evaluators/utils/trainer_qa.py
diff --git a/...ilm/utils/utils_nlclassifier_dataclass.py → ...ors/utils/utils_nlclassifier_dataclass.py b/...ilm/utils/utils_nlclassifier_dataclass.py → ...ors/utils/utils_nlclassifier_dataclass.py
diff --git a/zoo_torch/examples/minilm/utils/utils_qa.py → ...torch/minilm/evaluators/utils/utils_qa.py b/zoo_torch/examples/minilm/utils/utils_qa.py → ...torch/minilm/evaluators/utils/utils_qa.py
diff --git a/...amples/minilm/utils/utils_qa_dataclass.py → ...lm/evaluators/utils/utils_qa_dataclass.py b/...amples/minilm/utils/utils_qa_dataclass.py → ...lm/evaluators/utils/utils_qa_dataclass.py
diff --git a/...ilm/baseline_models/bert/modeling_bert.py → ...els/baseline_models/bert/modeling_bert.py b/...ilm/baseline_models/bert/modeling_bert.py → ...els/baseline_models/bert/modeling_bert.py
@@ -39,7 +39,7 @@
 from torch.nn import BCEWithLogitsLoss, CrossEntropyLoss, MSELoss
 
 from aimet_torch import elementwise_ops
-from utils.activations import get_activation
+from zoo_torch.minilm.evaluators.utils.activations import get_activation
 
 from transformers.file_utils import (
     ModelOutput,

diff --git a/zoo_torch/Docs/MobileBert.md → zoo_torch/mobilebert/MobileBert.md b/zoo_torch/Docs/MobileBert.md → zoo_torch/mobilebert/MobileBert.md
diff --git a/...rt/transformers_nlclassifier_quanteval.py → ...rs/transformers_nlclassifier_quanteval.py b/...rt/transformers_nlclassifier_quanteval.py → ...rs/transformers_nlclassifier_quanteval.py
diff --git a/...mples/minilm/transformers_qa_quanteval.py → ...t/evaluators/transformers_qa_quanteval.py b/...mples/minilm/transformers_qa_quanteval.py → ...t/evaluators/transformers_qa_quanteval.py
diff --git a/.../examples/mobilebert/utils/activations.py → ...obilebert/evaluators/utils/activations.py b/.../examples/mobilebert/utils/activations.py → ...obilebert/evaluators/utils/activations.py
diff --git a/...h/examples/mobilebert/utils/trainer_qa.py → ...mobilebert/evaluators/utils/trainer_qa.py b/...h/examples/mobilebert/utils/trainer_qa.py → ...mobilebert/evaluators/utils/trainer_qa.py
diff --git a/...ert/utils/utils_nlclassifier_dataclass.py → ...ors/utils/utils_nlclassifier_dataclass.py b/...ert/utils/utils_nlclassifier_dataclass.py → ...ors/utils/utils_nlclassifier_dataclass.py
diff --git a/...rch/examples/mobilebert/utils/utils_qa.py → ...h/mobilebert/evaluators/utils/utils_qa.py b/...rch/examples/mobilebert/utils/utils_qa.py → ...h/mobilebert/evaluators/utils/utils_qa.py
diff --git a/...es/mobilebert/utils/utils_qa_dataclass.py → ...rt/evaluators/utils/utils_qa_dataclass.py b/...es/mobilebert/utils/utils_qa_dataclass.py → ...rt/evaluators/utils/utils_qa_dataclass.py
diff --git a/..._models/mobilebert/modeling_mobilebert.py → ..._models/mobilebert/modeling_mobilebert.py b/..._models/mobilebert/modeling_mobilebert.py → ..._models/mobilebert/modeling_mobilebert.py
@@ -45,7 +45,7 @@
 
 #from ...activations import ACT2FN
 #from aimet_torch.transformers import activations
-from utils import activations
+from zoo_torch.mobilebert.evaluators.utils import activations
 from aimet_torch import elementwise_ops
 
 from transformers.file_utils import (

diff --git a/zoo_torch/Docs/MobilenetV2.md → zoo_torch/mobilenetv2/MobilenetV2.md b/zoo_torch/Docs/MobilenetV2.md → zoo_torch/mobilenetv2/MobilenetV2.md
diff --git a/...ples/mobilenetv2/mobilenetv2_quanteval.py → ...netv2/evaluators/mobilenetv2_quanteval.py b/...ples/mobilenetv2/mobilenetv2_quanteval.py → ...netv2/evaluators/mobilenetv2_quanteval.py
@@ -28,7 +28,7 @@
 from aimet_torch.utils import is_leaf_module
 from aimet_torch.qc_quantize_op import QcQuantizeStandAloneBase, QcQuantizeWrapper, StaticGridQuantWrapper
 
-from zoo_torch.examples.common.utils import get_device
+from zoo_torch.common.utils.utils import get_device
 
 
 def work_init(work_id):

diff --git a/zoo_torch/Docs/MobileViT.md → zoo_torch/mobilevit/MobileViT.md b/zoo_torch/Docs/MobileViT.md → zoo_torch/mobilevit/MobileViT.md
diff --git a/...nsformer_imageclassification_quanteval.py → ...nsformer_imageclassification_quanteval.py b/...nsformer_imageclassification_quanteval.py → ...nsformer_imageclassification_quanteval.py
diff --git a/...orch/examples/mobilevit/utils/imagenet.py → ...ch/mobilevit/evaluators/utils/imagenet.py b/...orch/examples/mobilevit/utils/imagenet.py → ...ch/mobilevit/evaluators/utils/imagenet.py
diff --git a/.../examples/mobilevit/utils/model_loader.py → ...obilevit/evaluators/utils/model_loader.py b/.../examples/mobilevit/utils/model_loader.py → ...obilevit/evaluators/utils/model_loader.py
diff --git a/...xamples/mobilevit/utils/quantize_model.py → ...ilevit/evaluators/utils/quantize_model.py b/...xamples/mobilevit/utils/quantize_model.py → ...ilevit/evaluators/utils/quantize_model.py
diff --git a/...ples/mobilevit/huggingface/activations.py → ...bilevit/models/huggingface/activations.py b/...ples/mobilevit/huggingface/activations.py → ...bilevit/models/huggingface/activations.py
diff --git a/...ne_models/mobilevit/modeling_mobilevit.py → ...ne_models/mobilevit/modeling_mobilevit.py b/...ne_models/mobilevit/modeling_mobilevit.py → ...ne_models/mobilevit/modeling_mobilevit.py
diff --git a/.../mobilevit/huggingface/elementwise_ops.py → ...vit/models/huggingface/elementwise_ops.py b/.../mobilevit/huggingface/elementwise_ops.py → ...vit/models/huggingface/elementwise_ops.py
diff --git a/zoo_torch/Docs/PoseEstimation.md → zoo_torch/poseestimation/PoseEstimation.md b/zoo_torch/Docs/PoseEstimation.md → zoo_torch/poseestimation/PoseEstimation.md
diff --git a/...seestimation/pose_estimation_quanteval.py → ...n/evaluators/pose_estimation_quanteval.py b/...seestimation/pose_estimation_quanteval.py → ...n/evaluators/pose_estimation_quanteval.py
@@ -39,7 +39,7 @@
 from aimet_common.defs import QuantScheme
 
 # aimet model zoo import
-from zoo_torch.examples.common import utils
+from zoo_torch.common.utils import utils
 
 
 def get_pre_stage_net():

diff --git a/zoo_torch/Docs/Roberta.md → zoo_torch/roberta/Roberta.md b/zoo_torch/Docs/Roberta.md → zoo_torch/roberta/Roberta.md
diff --git a/...ta/transformers_nlclassifier_quanteval.py → ...rs/transformers_nlclassifier_quanteval.py b/...ta/transformers_nlclassifier_quanteval.py → ...rs/transformers_nlclassifier_quanteval.py
diff --git a/...s/mobilebert/transformers_qa_quanteval.py → ...a/evaluators/transformers_qa_quanteval.py b/...s/mobilebert/transformers_qa_quanteval.py → ...a/evaluators/transformers_qa_quanteval.py
diff --git a/...rch/examples/roberta/utils/activations.py → ...h/roberta/evaluators/utils/activations.py b/...rch/examples/roberta/utils/activations.py → ...h/roberta/evaluators/utils/activations.py
diff --git a/...orch/examples/roberta/utils/trainer_qa.py → ...ch/roberta/evaluators/utils/trainer_qa.py b/...orch/examples/roberta/utils/trainer_qa.py → ...ch/roberta/evaluators/utils/trainer_qa.py
diff --git a/...rta/utils/utils_nlclassifier_dataclass.py → ...ors/utils/utils_nlclassifier_dataclass.py b/...rta/utils/utils_nlclassifier_dataclass.py → ...ors/utils/utils_nlclassifier_dataclass.py
diff --git a/zoo_torch/examples/roberta/utils/utils_qa.py → ...orch/roberta/evaluators/utils/utils_qa.py b/zoo_torch/examples/roberta/utils/utils_qa.py → ...orch/roberta/evaluators/utils/utils_qa.py
diff --git a/...mples/roberta/utils/utils_qa_dataclass.py → ...ta/evaluators/utils/utils_qa_dataclass.py b/...mples/roberta/utils/utils_qa_dataclass.py → ...ta/evaluators/utils/utils_qa_dataclass.py
diff --git a/...seline_models/roberta/modeling_roberta.py → ...seline_models/roberta/modeling_roberta.py b/...seline_models/roberta/modeling_roberta.py → ...seline_models/roberta/modeling_roberta.py
@@ -36,7 +36,7 @@
 from torch.nn import BCEWithLogitsLoss, CrossEntropyLoss, MSELoss
 
 from aimet_torch import elementwise_ops
-from utils.activations import get_activation
+from zoo_torch.roberta.evaluators.utils.activations import get_activation
 
 from transformers.file_utils import (
     add_code_sample_docstrings,

diff --git a/zoo_torch/Docs/SRGAN.md → zoo_torch/srgan/SRGAN.md b/zoo_torch/Docs/SRGAN.md → zoo_torch/srgan/SRGAN.md
diff --git a/zoo_torch/examples/srgan/srgan_eval.patch → zoo_torch/srgan/evaluators/srgan_eval.patch b/zoo_torch/examples/srgan/srgan_eval.patch → zoo_torch/srgan/evaluators/srgan_eval.patch
diff --git a/zoo_torch/examples/srgan/srgan_quanteval.py → ...torch/srgan/evaluators/srgan_quanteval.py b/zoo_torch/examples/srgan/srgan_quanteval.py → ...torch/srgan/evaluators/srgan_quanteval.py
@@ -38,7 +38,7 @@
 from aimet_torch import quantsim
 
 # import common util in AIMET examples folder
-from zoo_torch.examples.common import utils
+from zoo_torch.common.utils import utils
 
 
 def evaluate_generator(generator,

diff --git a/zoo_torch/Docs/MobileNetV2-SSD-lite.md → ...h/ssd_mobilenetv2/MobileNetV2-SSD-lite.md b/zoo_torch/Docs/MobileNetV2-SSD-lite.md → ...h/ssd_mobilenetv2/MobileNetV2-SSD-lite.md
diff --git a/.../examples/ssd_mobilenetv2/patch_ssd.patch → ...sd_mobilenetv2/evaluators/patch_ssd.patch b/.../examples/ssd_mobilenetv2/patch_ssd.patch → ...sd_mobilenetv2/evaluators/patch_ssd.patch
diff --git a/..._mobilenetv2/ssd_mobilenetv2_quanteval.py → ...2/evaluators/ssd_mobilenetv2_quanteval.py b/..._mobilenetv2/ssd_mobilenetv2_quanteval.py → ...2/evaluators/ssd_mobilenetv2_quanteval.py
@@ -56,7 +56,7 @@
 from aimet_torch.quantsim import QuantizationSimModel
 
 # AIMET model zoo imports
-from zoo_torch.examples.common.utils import get_device
+from zoo_torch.common.utils.utils import get_device
 
 def download_weights():
     # Download labels

diff --git a/zoo_torch/Docs/SuperRes.md → zoo_torch/superres/SuperRes.md b/zoo_torch/Docs/SuperRes.md → zoo_torch/superres/SuperRes.md
diff --git a/...perres/notebooks/superres_quanteval.ipynb → ...uators/notebooks/superres_quanteval.ipynb b/...perres/notebooks/superres_quanteval.ipynb → ...uators/notebooks/superres_quanteval.ipynb
diff --git a/...torch/examples/superres/utils/__init__.py → ...rch/superres/evaluators/utils/__init__.py b/...torch/examples/superres/utils/__init__.py → ...rch/superres/evaluators/utils/__init__.py
diff --git a/zoo_torch/examples/superres/utils/blocks.py → ...torch/superres/evaluators/utils/blocks.py b/zoo_torch/examples/superres/utils/blocks.py → ...torch/superres/evaluators/utils/blocks.py
diff --git a/...rch/examples/superres/utils/downloader.py → ...h/superres/evaluators/utils/downloader.py b/...rch/examples/superres/utils/downloader.py → ...h/superres/evaluators/utils/downloader.py
diff --git a/zoo_torch/examples/superres/utils/helpers.py → ...orch/superres/evaluators/utils/helpers.py b/zoo_torch/examples/superres/utils/helpers.py → ...orch/superres/evaluators/utils/helpers.py
diff --git a/...torch/examples/superres/utils/imresize.py → ...rch/superres/evaluators/utils/imresize.py b/...torch/examples/superres/utils/imresize.py → ...rch/superres/evaluators/utils/imresize.py
diff --git a/...orch/examples/superres/utils/inference.py → ...ch/superres/evaluators/utils/inference.py b/...orch/examples/superres/utils/inference.py → ...ch/superres/evaluators/utils/inference.py
diff --git a/zoo_torch/examples/superres/utils/models.py → ...torch/superres/evaluators/utils/models.py b/zoo_torch/examples/superres/utils/models.py → ...torch/superres/evaluators/utils/models.py
diff --git a/zoo_torch/Docs/ViT.md → zoo_torch/vit/ViT.md b/zoo_torch/Docs/ViT.md → zoo_torch/vit/ViT.md
diff --git a/...nsformer_imageclassification_quanteval.py → ...nsformer_imageclassification_quanteval.py b/...nsformer_imageclassification_quanteval.py → ...nsformer_imageclassification_quanteval.py
diff --git a/zoo_torch/examples/vit/utils/imagenet.py → zoo_torch/vit/evaluators/utils/imagenet.py b/zoo_torch/examples/vit/utils/imagenet.py → zoo_torch/vit/evaluators/utils/imagenet.py
diff --git a/zoo_torch/examples/vit/utils/model_loader.py → ...orch/vit/evaluators/utils/model_loader.py b/zoo_torch/examples/vit/utils/model_loader.py → ...orch/vit/evaluators/utils/model_loader.py
diff --git a/...orch/examples/vit/utils/quantize_model.py → ...ch/vit/evaluators/utils/quantize_model.py b/...orch/examples/vit/utils/quantize_model.py → ...ch/vit/evaluators/utils/quantize_model.py
diff --git a/...h/examples/vit/huggingface/activations.py → ...rch/vit/models/huggingface/activations.py b/...h/examples/vit/huggingface/activations.py → ...rch/vit/models/huggingface/activations.py
diff --git a/...gface/baseline_models/vit/modeling_vit.py → ...gface/baseline_models/vit/modeling_vit.py b/...gface/baseline_models/vit/modeling_vit.py → ...gface/baseline_models/vit/modeling_vit.py
diff --git a/...amples/vit/huggingface/elementwise_ops.py → ...vit/models/huggingface/elementwise_ops.py b/...amples/vit/huggingface/elementwise_ops.py → ...vit/models/huggingface/elementwise_ops.py