diff --git a/contrib/WSProxyCloudFormation.yaml b/contrib/aws/WSProxyCloudFormation.yaml
similarity index 100%
rename from contrib/WSProxyCloudFormation.yaml
rename to contrib/aws/WSProxyCloudFormation.yaml
diff --git a/contrib/common.py b/contrib/aws/common.py
similarity index 100%
rename from contrib/common.py
rename to contrib/aws/common.py
diff --git a/contrib/example.py b/contrib/aws/example.py
similarity index 100%
rename from contrib/example.py
rename to contrib/aws/example.py
diff --git a/contrib/measurements/2020-06-08_1.0.0_perf.json b/contrib/aws/measurements/2020-06-08_1.0.0_perf.json
similarity index 100%
rename from contrib/measurements/2020-06-08_1.0.0_perf.json
rename to contrib/aws/measurements/2020-06-08_1.0.0_perf.json
diff --git a/contrib/measurements/2020-06-08_1.1.0_perf.json b/contrib/aws/measurements/2020-06-08_1.1.0_perf.json
similarity index 100%
rename from contrib/measurements/2020-06-08_1.1.0_perf.json
rename to contrib/aws/measurements/2020-06-08_1.1.0_perf.json
diff --git a/contrib/measurements/2020-06-08_1.2.0_perf.json b/contrib/aws/measurements/2020-06-08_1.2.0_perf.json
similarity index 100%
rename from contrib/measurements/2020-06-08_1.2.0_perf.json
rename to contrib/aws/measurements/2020-06-08_1.2.0_perf.json
diff --git a/contrib/measurements/2020-06-08_1.3.0_perf.json b/contrib/aws/measurements/2020-06-08_1.3.0_perf.json
similarity index 100%
rename from contrib/measurements/2020-06-08_1.3.0_perf.json
rename to contrib/aws/measurements/2020-06-08_1.3.0_perf.json
diff --git a/contrib/measurements/2020-06-08_1.4.0_perf.json b/contrib/aws/measurements/2020-06-08_1.4.0_perf.json
similarity index 100%
rename from contrib/measurements/2020-06-08_1.4.0_perf.json
rename to contrib/aws/measurements/2020-06-08_1.4.0_perf.json
diff --git a/contrib/measurements/2020-10-28_2.0.0_perf.json b/contrib/aws/measurements/2020-10-28_2.0.0_perf.json
similarity index 100%
rename from contrib/measurements/2020-10-28_2.0.0_perf.json
rename to contrib/aws/measurements/2020-10-28_2.0.0_perf.json
diff --git a/contrib/measurements/2021-02-06_2.1.0_perf.json b/contrib/aws/measurements/2021-02-06_2.1.0_perf.json
similarity index 100%
rename from contrib/measurements/2021-02-06_2.1.0_perf.json
rename to contrib/aws/measurements/2021-02-06_2.1.0_perf.json
diff --git a/contrib/performance.py b/contrib/aws/performance.py
similarity index 100%
rename from contrib/performance.py
rename to contrib/aws/performance.py
diff --git a/contrib/testnet.py b/contrib/aws/testnet.py
similarity index 100%
rename from contrib/testnet.py
rename to contrib/aws/testnet.py