diff --git a/airflow_anomaly_detection/__init__.py b/airflow_anomaly_detection/__init__.py
index 62c905e..9d575a0 100644
--- a/airflow_anomaly_detection/__init__.py
+++ b/airflow_anomaly_detection/__init__.py
@@ -1,5 +1,5 @@
 
-__version__ = "0.0.21"
+__version__ = "0.0.22"
 
 def get_provider_info():
     return {
diff --git a/airflow_anomaly_detection/example_dags/bigquery_anomaly_detection_dag/bigquery_anomaly_detection_dag.py b/airflow_anomaly_detection/example_dags/bigquery_anomaly_detection_dag/bigquery_anomaly_detection_dag.py
index ffff084..e0818c9 100644
--- a/airflow_anomaly_detection/example_dags/bigquery_anomaly_detection_dag/bigquery_anomaly_detection_dag.py
+++ b/airflow_anomaly_detection/example_dags/bigquery_anomaly_detection_dag/bigquery_anomaly_detection_dag.py
@@ -15,10 +15,10 @@
 import pendulum
 import yaml
 from airflow.decorators import dag
-from airflow_anomaly_detection.operators.bigquery_metric_batch_ingest_operator import BigQueryMetricBatchIngestOperator
-from airflow_anomaly_detection.operators.bigquery_metric_batch_train_operator import BigQueryMetricBatchTrainOperator
-from airflow_anomaly_detection.operators.bigquery_metric_batch_score_operator import BigQueryMetricBatchScoreOperator
-from airflow_anomaly_detection.operators.bigquery_metric_batch_alert_operator import BigQueryMetricBatchAlertOperator
+from airflow_anomaly_detection.operators.bigquery.metric_batch_ingest_operator import BigQueryMetricBatchIngestOperator
+from airflow_anomaly_detection.operators.bigquery.metric_batch_train_operator import BigQueryMetricBatchTrainOperator
+from airflow_anomaly_detection.operators.bigquery.metric_batch_score_operator import BigQueryMetricBatchScoreOperator
+from airflow_anomaly_detection.operators.bigquery.metric_batch_alert_operator import BigQueryMetricBatchAlertOperator
 from airflow_anomaly_detection.operators.metric_batch_email_notify_operator import MetricBatchEmailNotifyOperator
 from airflow_anomaly_detection.utils import get_metric_batch_configs
 
diff --git a/airflow_anomaly_detection/operators/bigquery_metric_batch_alert_operator.py b/airflow_anomaly_detection/operators/bigquery/metric_batch_alert_operator.py
similarity index 100%
rename from airflow_anomaly_detection/operators/bigquery_metric_batch_alert_operator.py
rename to airflow_anomaly_detection/operators/bigquery/metric_batch_alert_operator.py
diff --git a/airflow_anomaly_detection/operators/bigquery_metric_batch_ingest_operator.py b/airflow_anomaly_detection/operators/bigquery/metric_batch_ingest_operator.py
similarity index 100%
rename from airflow_anomaly_detection/operators/bigquery_metric_batch_ingest_operator.py
rename to airflow_anomaly_detection/operators/bigquery/metric_batch_ingest_operator.py
diff --git a/airflow_anomaly_detection/operators/bigquery_metric_batch_score_operator.py b/airflow_anomaly_detection/operators/bigquery/metric_batch_score_operator.py
similarity index 100%
rename from airflow_anomaly_detection/operators/bigquery_metric_batch_score_operator.py
rename to airflow_anomaly_detection/operators/bigquery/metric_batch_score_operator.py
diff --git a/airflow_anomaly_detection/operators/bigquery_metric_batch_train_operator.py b/airflow_anomaly_detection/operators/bigquery/metric_batch_train_operator.py
similarity index 100%
rename from airflow_anomaly_detection/operators/bigquery_metric_batch_train_operator.py
rename to airflow_anomaly_detection/operators/bigquery/metric_batch_train_operator.py
diff --git a/airflow_anomaly_detection/tests/operators/test_bigquery_metric_batch_alert_operator.py b/airflow_anomaly_detection/tests/operators/test_bigquery_metric_batch_alert_operator.py
index 0866711..30b1350 100644
--- a/airflow_anomaly_detection/tests/operators/test_bigquery_metric_batch_alert_operator.py
+++ b/airflow_anomaly_detection/tests/operators/test_bigquery_metric_batch_alert_operator.py
@@ -1,7 +1,7 @@
 import unittest
 from unittest.mock import patch, MagicMock
 from pandas import DataFrame
-from airflow_anomaly_detection.operators.bigquery_metric_batch_alert_operator import BigQueryMetricBatchAlertOperator
+from airflow_anomaly_detection.operators.bigquery.metric_batch_alert_operator import BigQueryMetricBatchAlertOperator
 
 class TestBigQueryMetricBatchAlertOperator(unittest.TestCase):
 
diff --git a/pyproject.toml b/pyproject.toml
index 089d2de..110bfcf 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "airflow-provider-anomaly-detection"
-version = "0.0.21"
+version = "0.0.22"
 authors = [
   { name="andrewm4894", email="andrewm4894@gmail.com" },
 ]