diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index cf49523818..0000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,4 +0,0 @@
-[submodule "binary-websocket-api"]
-	path = binary-websocket-api
-	url = git@github.com:regentmarkets/binary-websocket-api.git
-	branch = master
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000..abd055adeb
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,11 @@
+.PHONY: help update_schemas setup
+
+help:
+	@echo "update_schemas - Update the schemas"
+	@echo "setup - Generate dart code from the schemas"
+
+update_schemas:
+	./update_schemas.sh
+
+setup:
+	./setup.sh
diff --git a/README.md b/README.md
index 85bb4367ef..5cbb11084c 100644
--- a/README.md
+++ b/README.md
@@ -108,6 +108,13 @@ $ cd flutter-deriv-api
 $ flutter pub get
 ```
 
+### Setup
+```bash
+$ make update_schemas
+$ make setup
+$ dart run build_runner build --delete-conflicting-outputs
+```
+
 ### Use this package as a library
 
 Add this to your package's `pubspec.yaml` file:
@@ -121,30 +128,6 @@ dependencies:
             ref: master
 ```
 
-### Use this package as a submodule
-
-```
-$ git submodule add https://github.com/regentmarkets/flutter-deriv-api.git
-```
-
-Add this to your package's `pubspec.yaml` file:
-
-```
-dependencies:
-    ...
-    flutter_deriv_api:
-        path: ./flutter-deriv-api/
-```
-
-### Initialize and update submodule
-
-```
-$ git submodule init
-$ git submodule update --remote
-$ ./setup.sh
-$ dart run build_runner build --delete-conflicting-outputs
-```
-
 ### Run the tests
 
 ```
diff --git a/setup.sh b/setup.sh
index ce4197620e..b446bcdb6b 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,11 +1,38 @@
 #!/bin/bash
 
-# symlink files from submodule to lib/basic_api/generated
-ls binary-websocket-api/config/v3/**/{receive,send}.json | perl -lpe'my $base = s{^binary-websocket-api/config/v3/}{}r; my $target = "lib/basic_api/generated/" . ($base =~ s{/}{_}r); symlink "../../../$_" => $target or die "no luck with symlink on $_ - $!" unless -r $target'
+# Exit immediately if a command exits with a non-zero status
+set -e
 
-# copy manually added json files to lib/basic_api/generated if not already there
-# cp -n lib/basic_api/manually/*.json lib/basic_api/generated
+# Define the source and target directories
+SOURCE_DIR="schemas"
+TARGET_DIR="lib/basic_api/generated"
 
-# generates lib/basic_api/generated/api.dart
-ls lib/basic_api/generated | egrep '\.json$' | perl -lne'print qq{export "$_.dart";}' > lib/basic_api/generated/api.dart
-perl -pi -e 's/.json//g' lib/basic_api/generated/api.dart
+# Remove the target directory if it exists
+if [ -d "$TARGET_DIR" ]; then
+    echo "Removing existing directory: $TARGET_DIR"
+    rm -rf "$TARGET_DIR"
+fi
+
+# Ensure the target directory exists
+mkdir -p "$TARGET_DIR"
+
+# Create symlinks for the JSON files
+find "$SOURCE_DIR" -type f \( -name 'receive.json' -o -name 'send.json' \) | while read -r file; do
+    base=$(echo "$file" | sed "s|^$SOURCE_DIR/||")
+    target="$TARGET_DIR/$(echo "$base" | tr '/' '_')"
+    if [ ! -e "$target" ]; then
+        ln -s "../../../$file" "$target"
+        echo "Symlink created: $target -> $file"
+    else
+        echo "Symlink already exists: $target"
+    fi
+done
+
+# Uncomment the following line if you want to copy manually added JSON files to the target directory if not already there
+# cp -n lib/basic_api/manually/*.json "$TARGET_DIR"
+
+# Generate lib/basic_api/generated/api.dart
+ls "$TARGET_DIR" | grep '\.json$' | awk '{print "export \"" $0 ".dart\";"}' > "$TARGET_DIR/api.dart"
+perl -pi -e 's/.json//g' "$TARGET_DIR/api.dart"
+
+echo "api.dart generated at $TARGET_DIR/api.dart"
diff --git a/update_schemas.sh b/update_schemas.sh
new file mode 100755
index 0000000000..93f7cf1497
--- /dev/null
+++ b/update_schemas.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# Exit immediately if a command exits with a non-zero status
+set -e
+
+# Define the path for the submodule within the main repository
+SUBMODULE_PATH="binary-websocket-api"
+TARGET_PATH="schemas"
+
+# Create a temporary directory
+TEMP_DIR=$(mktemp -d)
+
+# Function to clean up the temporary directory on exit
+cleanup() {
+    rm -rf "$TEMP_DIR"
+}
+trap cleanup EXIT
+
+# Clone the bom-core repository into the temporary directory
+git clone --depth 1 git@github.com:regentmarkets/bom-core.git "$TEMP_DIR/bom-core"
+
+# Check if the binary-websocket-api directory exists in the cloned repository
+if [ ! -d "$TEMP_DIR/bom-core/$SUBMODULE_PATH" ]; then
+    echo "Directory $SUBMODULE_PATH does not exist in the bom-core repository. Aborting."
+    exit 1
+fi
+
+# Remove existing submodule directory if necessary
+if [ -d "$TARGET_PATH" ]; then
+    echo "Removing existing directory: $TARGET_PATH"
+    rm -rf "$TARGET_PATH"
+fi
+
+# Copy the binary-websocket-api directory from the temporary directory to the current directory
+cp -r "$TEMP_DIR/bom-core/$SUBMODULE_PATH/config/v3/" "$TARGET_PATH"
+
+
+echo "Submodule 'binary-websocket-api' successfully copied into the main repository."