diff --git a/Dockerfile b/Dockerfile
index caf58247..8a03b3c4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -194,16 +194,17 @@ WORKDIR /DeepSpeech/
 RUN pip3 install tensorflow-gpu==1.15.0
 
 
-# Make DeepSpeech and install Python bindings
+# Build client.cc and install Python client and decoder bindings
 ENV TFDIR /tensorflow
 WORKDIR /DeepSpeech/native_client
 RUN make deepspeech
-WORKDIR /DeepSpeech/native_client/python
-RUN make bindings
-RUN pip3 install --upgrade dist/deepspeech*
-WORKDIR /DeepSpeech/native_client/ctcdecode
-RUN make bindings
-RUN pip3 install --upgrade dist/*.whl
+
+WORKDIR /DeepSpeech
+RUN cd native_client/python && make bindings
+RUN pip3 install --upgrade native_client/python/dist/*.whl
+
+RUN cd native_client/ctcdecode && make bindings
+RUN pip3 install --upgrade native_client/ctcdecode/dist/*.whl
 
 
 # << END Build and bind
diff --git a/GRAPH_VERSION b/GRAPH_VERSION
deleted file mode 100644
index 1e8b3149..00000000
--- a/GRAPH_VERSION
+++ /dev/null
@@ -1 +0,0 @@
-6
diff --git a/GRAPH_VERSION b/GRAPH_VERSION
new file mode 120000
index 00000000..b9a65815
--- /dev/null
+++ b/GRAPH_VERSION
@@ -0,0 +1 @@
+training/deepspeech_training/GRAPH_VERSION
\ No newline at end of file
diff --git a/VERSION b/VERSION
deleted file mode 100644
index f38fc539..00000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.7.3
diff --git a/VERSION b/VERSION
new file mode 120000
index 00000000..8a3ed242
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+training/deepspeech_training/VERSION
\ No newline at end of file
diff --git a/native_client/bazel_workspace_status_cmd.sh b/native_client/bazel_workspace_status_cmd.sh
index 7969b19a..a1a5a2a0 100755
--- a/native_client/bazel_workspace_status_cmd.sh
+++ b/native_client/bazel_workspace_status_cmd.sh
@@ -22,8 +22,8 @@ echo "STABLE_TF_GIT_VERSION ${tf_git_rev}"
 pushd $(dirname "$0")
 ds_git_rev=$(git describe --long --tags)
 echo "STABLE_DS_GIT_VERSION ${ds_git_rev}"
-ds_version=$(cat ../VERSION)
+ds_version=$(cat ../training/deepspeech_training/VERSION)
 echo "STABLE_DS_VERSION ${ds_version}"
-ds_graph_version=$(cat ../GRAPH_VERSION)
+ds_graph_version=$(cat ../training/deepspeech_training/GRAPH_VERSION)
 echo "STABLE_DS_GRAPH_VERSION ${ds_graph_version}"
 popd
diff --git a/native_client/ctcdecode/setup.py b/native_client/ctcdecode/setup.py
index 8a3876c9..82e702a8 100644
--- a/native_client/ctcdecode/setup.py
+++ b/native_client/ctcdecode/setup.py
@@ -51,7 +51,7 @@ def maybe_rebuild(srcs, out_name, build_dir):
                      num_parallel=known_args.num_processes,
                      debug=debug)
 
-project_version = read('../../VERSION').strip()
+project_version = read('../../training/deepspeech_training/VERSION').strip()
 
 build_dir = 'temp_build/temp_build'
 
diff --git a/native_client/javascript/Makefile b/native_client/javascript/Makefile
index 28b00046..ac5ee8ed 100644
--- a/native_client/javascript/Makefile
+++ b/native_client/javascript/Makefile
@@ -3,7 +3,7 @@ NODE_ABI_TARGET    ?=
 NODE_BUILD_VERBOSE ?= --verbose
 NPM_TOOL           ?= npm
 PROJECT_NAME       ?= deepspeech
-PROJECT_VERSION    ?= $(shell cat ../../VERSION | tr -d '\n')
+PROJECT_VERSION    ?= $(shell cat ../../training/deepspeech_training/VERSION | tr -d '\n')
 NPM_ROOT           ?= $(shell npm root)
 
 NODE_MODULES_BIN   ?= $(NPM_ROOT)/.bin/
diff --git a/native_client/python/setup.py b/native_client/python/setup.py
index b5a5d95b..0e1d0e62 100755
--- a/native_client/python/setup.py
+++ b/native_client/python/setup.py
@@ -31,7 +31,7 @@ def main():
         sys.argv.remove('--project_name')
         sys.argv.pop(project_name_idx)
 
-    with open('../../VERSION', 'r') as ver:
+    with open('../../training/deepspeech_training/VERSION', 'r') as ver:
         project_version = ver.read().strip()
 
     class BuildExtFirst(build):
diff --git a/taskcluster/tc-all-vars.sh b/taskcluster/tc-all-vars.sh
index 74887bdc..1a38e18b 100755
--- a/taskcluster/tc-all-vars.sh
+++ b/taskcluster/tc-all-vars.sh
@@ -57,7 +57,7 @@ export DS_TFDIR=${DS_ROOT_TASK}/DeepSpeech/tf
 export DS_DSDIR=${DS_ROOT_TASK}/DeepSpeech/ds
 export DS_EXAMPLEDIR=${DS_ROOT_TASK}/DeepSpeech/examples
 
-export DS_VERSION="$(cat ${DS_DSDIR}/VERSION)"
+export DS_VERSION="$(cat ${DS_DSDIR}/training/deepspeech_training/VERSION)"
 
 export GRADLE_USER_HOME=${DS_ROOT_TASK}/gradle-cache
 export ANDROID_SDK_HOME=${DS_ROOT_TASK}/DeepSpeech/Android/SDK/
diff --git a/training/deepspeech_training/GRAPH_VERSION b/training/deepspeech_training/GRAPH_VERSION
deleted file mode 120000
index bef0a41b..00000000
--- a/training/deepspeech_training/GRAPH_VERSION
+++ /dev/null
@@ -1 +0,0 @@
-../../GRAPH_VERSION
\ No newline at end of file
diff --git a/training/deepspeech_training/GRAPH_VERSION b/training/deepspeech_training/GRAPH_VERSION
new file mode 100644
index 00000000..1e8b3149
--- /dev/null
+++ b/training/deepspeech_training/GRAPH_VERSION
@@ -0,0 +1 @@
+6
diff --git a/training/deepspeech_training/VERSION b/training/deepspeech_training/VERSION
deleted file mode 120000
index 558194c5..00000000
--- a/training/deepspeech_training/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-../../VERSION
\ No newline at end of file
diff --git a/training/deepspeech_training/VERSION b/training/deepspeech_training/VERSION
new file mode 100644
index 00000000..f38fc539
--- /dev/null
+++ b/training/deepspeech_training/VERSION
@@ -0,0 +1 @@
+0.7.3