diff --git a/scripts/download-oas.sh b/scripts/download-oas.sh
index adaaad1..0aeaada 100755
--- a/scripts/download-oas.sh
+++ b/scripts/download-oas.sh
@@ -23,6 +23,19 @@ if [[ -z ${OAS_API_VERSIONS} ]]; then
 	OAS_API_VERSIONS="${ROOT_DIR}/api-versions-lock.json"
 fi
 
+if [ -d "${ROOT_DIR}/oas" ]; then
+	echo "OAS folder found. Will be removed"
+	rm -rf "${ROOT_DIR}/oas"
+fi
+
+git clone "${OAS_REPO}" "${ROOT_DIR}/oas" --quiet
+# OPTIONAL: Lock to a specific commit
+# cd "${ROOT_DIR}/oas"
+# git checkout <HASH>
+
+# NOTE: Everything below is needed for the "compatibility layer" logic. 
+# It can be completely removed once the compatibility layer isn't needed anymore in the SDK.
+
 # Create temp directory to clone OAS repo
 work_dir=$(mktemp -d)
 if [[ ! ${work_dir} || -d {work_dir} ]]; then
@@ -31,13 +44,7 @@ if [[ ! ${work_dir} || -d {work_dir} ]]; then
 fi
 trap "rm -rf ${work_dir}" EXIT # Delete temp directory on exit
 
-if [ -d "${ROOT_DIR}/oas" ]; then
-	echo "OAS folder found. Will be removed"
-	rm -r "${ROOT_DIR}/oas"
-fi
-
-# Move oas to root level
-mkdir "${ROOT_DIR}/oas"
+mkdir "${ROOT_DIR}/oas/legacy"
 cd "${work_dir}"
 git clone "${OAS_REPO}" --quiet
 
@@ -67,11 +74,6 @@ EOF
 	service_normalized=$(echo "${service_normalized}" | tr '[:upper:]' '[:lower:]') # convert upper case letters to lower case
 	service_normalized=$(echo "${service_normalized}" | tr -d -c '[:alnum:]')       # remove non-alphanumeric characters
 	echo "$service_normalized=$(git rev-parse HEAD)" >> oas_commits
-	# To support initial integrations of the IaaS API in an Alpha state, we will temporarily use it to generate an IaaS Alpha SDK module
-	# This check can be removed once the IaaS API moves all endpoints to Beta
-	if [[ ${service_normalized} == "iaas" ]]; then
-		echo "iaasalpha=$(git rev-parse HEAD)" >> oas_commits
-	fi
 
 	cd - >/dev/null
 
@@ -88,12 +90,6 @@ EOF
 			version=${version#v}
 			# Check if version is alpha
 			if [[ ${version} == *alpha* ]]; then
-				# To support initial integrations of the IaaS API in an Alpha state, we will temporarily use it to generate an IaaS Alpha SDK module
-				# This check can be removed once the IaaS API moves all endpoints to Beta
-				if [[ ${service} == "iaas" ]]; then
-					mv -f ${dir}/*.json ${ROOT_DIR}/oas/iaasalpha.json
-					continue
-				fi
 				if [[ ${ALLOW_ALPHA} != "true" ]]; then
 					continue
 				fi
@@ -135,6 +131,6 @@ EOF
 		echo "No elegible OAS found for ${service_dir}"
 		continue
 	fi
-	mv -f ${max_version_dir}/*.json ${ROOT_DIR}/oas
+	mv -f ${max_version_dir}/*.json ${ROOT_DIR}/oas/legacy
 done
-mv -f ${work_dir}/${OAS_REPO_NAME}/oas_commits ${ROOT_DIR}/oas/oas_commits
\ No newline at end of file
+mv -f ${work_dir}/${OAS_REPO_NAME}/oas_commits ${ROOT_DIR}/oas/legacy/oas_commits
diff --git a/scripts/generate-sdk/languages/go.sh b/scripts/generate-sdk/languages/go.sh
index 5d5350c..714d333 100644
--- a/scripts/generate-sdk/languages/go.sh
+++ b/scripts/generate-sdk/languages/go.sh
@@ -109,7 +109,7 @@ generate_go_sdk() {
     warning=""
 
     # Generate SDK for each service
-    for service_json in ${ROOT_DIR}/oas/*.json; do
+    for service_json in ${ROOT_DIR}/oas/legacy/*.json; do
         service="${service_json##*/}"
         service="${service%.json}"
 
diff --git a/scripts/generate-sdk/languages/java.sh b/scripts/generate-sdk/languages/java.sh
index 5c6289d..de81419 100644
--- a/scripts/generate-sdk/languages/java.sh
+++ b/scripts/generate-sdk/languages/java.sh
@@ -78,7 +78,7 @@ generate_java_sdk() {
     warning=""
 
     # Generate SDK for each service
-    for service_json in "${ROOT_DIR}"/oas/*.json; do
+    for service_json in "${ROOT_DIR}"/oas/legacy/*.json; do
         service="${service_json##*/}"
         service="${service%.json}"
 
diff --git a/scripts/generate-sdk/languages/python.sh b/scripts/generate-sdk/languages/python.sh
index a290d39..f5e060f 100644
--- a/scripts/generate-sdk/languages/python.sh
+++ b/scripts/generate-sdk/languages/python.sh
@@ -81,7 +81,7 @@ generate_python_sdk() {
     warning=""
 
     # Generate SDK for each service
-    for service_json in ${ROOT_DIR}/oas/*.json; do
+    for service_json in ${ROOT_DIR}/oas/legacy/*.json; do
         service="${service_json##*/}"
         service="${service%.json}"
 
diff --git a/scripts/sdk-create-pr.sh b/scripts/sdk-create-pr.sh
index 80bb7f1..ef4c359 100755
--- a/scripts/sdk-create-pr.sh
+++ b/scripts/sdk-create-pr.sh
@@ -127,8 +127,8 @@ for service_path in ${work_dir}/sdk_to_push/services/*; do
           echo "old commit: ${old_commit}"
         fi
         new_commit=""
-        if [[ -f "${ROOT_DIR}/oas/oas_commits" ]]; then
-          new_commit=$(grep "${service}=" "${ROOT_DIR}/oas/oas_commits" | cut -d = -f 2)
+        if [[ -f "${ROOT_DIR}/oas/legacy/oas_commits" ]]; then
+          new_commit=$(grep "${service}=" "${ROOT_DIR}/oas/legacy/oas_commits" | cut -d = -f 2)
           echo "new commit: ${new_commit}"
         fi
         compare_link=""