diff --git a/INSTALL b/INSTALL
index 9adc438674..75850a96ba 100644
--- a/INSTALL
+++ b/INSTALL
@@ -17,11 +17,14 @@ viewing the file over GitHub via a web browser:
 This document will always contain the most up-to-date information related
 to instantiating a BLIS library from the framework source code. If you have
 any further questions or wish to provide feedback, please contact the BLIS
-community by posting your message to the BLIS developer's mailing list:
+community by either by joining our Discord community! Instructions for
+joining may be found in:
 
-  https://groups.google.com/d/forum/blis-devel
+  docs/Discord.md
 
-Thanks for your interest in the BLIS framework!
+or in rendered form at:
+
+  https://github.com/flame/blis/blob/master/docs/Discord.md
 
-Field Van Zee
+Thanks for your interest in the BLIS framework!
 
diff --git a/RELEASING b/RELEASING
index 351594c49d..0996a560da 100644
--- a/RELEASING
+++ b/RELEASING
@@ -7,38 +7,42 @@ Here are the steps to follow to create a new release (version) of BLIS:
 
    If there are any commits upstream, merge them as appropriate.
 
-2. Verify that the code builds properly.
+2. Consider whether the so_version should be updated (via the so_version
+   file in the 'build' directory) due to any ABI changes since the previous
+   version. If so, commit that change now.
+
+3. Verify that the code builds properly.
 
    $ ./configure auto; make
 
-3. Verify that the code passes BLIS and BLAS tests:
+4. Verify that the code passes BLIS and BLAS tests:
 
    $ make check           # BLIS testsuite (fast) + BLAS test drivers
    $ make checkblis       # BLIS testsuite (full ex. mixed-datatype)
    $ make checkblis-md    # BLIS testsuite (mixed-datatype only)
    $ make checkblis-salt  # BLIS testsuite (fast + salt)
 
-4. Draft a new announcement to blis-devel, crediting those who
+5. Draft a new announcement to blis-devel, crediting those who
    contributed towards this version by browsing 'git log'.
 
-5. Update CREDITS file if 'git log' reveals any new contributors.
+6. Update CREDITS file if 'git log' reveals any new contributors.
 
-6. Update docs/ReleaseNotes.md file with body of finalized announcement
+7. Update docs/ReleaseNotes.md file with body of finalized announcement
    and the date of the release.
 
-7. Commit changes from steps 5 and 6.
+8. Commit changes from steps 5 and 6.
 
-8. Bump the version number:
+9. Bump the version number:
 
    $ ./build/bump-version.sh "0.3.2"
 
    This will result in two new commits: a version file update and a CHANGELOG
    file update.
 
-9. Push the new commits and new tag associated with the new version:
+10. Push the new commits and new tag associated with the new version:
 
    $ git push
    $ git push --tag
 
-10. Send finalized announcement to blis-devel.
+11. Send finalized announcement to blis-devel.
 
diff --git a/build/bump-version.sh b/build/bump-version.sh
index 65e1a2988f..b72a09a40e 100755
--- a/build/bump-version.sh
+++ b/build/bump-version.sh
@@ -98,10 +98,10 @@ main()
 	# The name of the CHANGELOG file.
 	changelog_file='CHANGELOG'
 
-	# The name of the default version file.
-	version_file_def='version'
+	# The name and location of the default version file.
+	version_file_def='build/version'
 
-	# The name of the specified version file.
+	# The name and location of the specified version file.
 	version_file=''
 
 	# Strings used during version query.
diff --git a/so_version b/build/so_version
similarity index 100%
rename from so_version
rename to build/so_version
diff --git a/version b/build/version
similarity index 100%
rename from version
rename to build/version
diff --git a/configure b/configure
index 5bfa608cd2..fd4812b1b2 100755
--- a/configure
+++ b/configure
@@ -2346,10 +2346,6 @@ main()
 	# of the distribution and the directory in which we are building.
 	cur_dirpath="."
 
-	# The file in which the version string is kept.
-	version_file="version"
-	version_filepath="${dist_path}/${version_file}"
-
 	# The name of and path to the directory named "build" in the top-level
 	# directory of the source distribution.
 	build_dir='build'
@@ -2431,9 +2427,13 @@ main()
 
 	# -- Version-related --
 
+	# The file in which the version string is kept.
+	version_file="version"
+	version_filepath="${build_dirpath}/${version_file}"
+
 	# The shared library (.so) version file.
 	so_version_file='so_version'
-	so_version_filepath="${dist_path}/${so_version_file}"
+	so_version_filepath="${build_dirpath}/${so_version_file}"
 
 	# The major and minor/build .so version numbers.
 	so_version_major=''
diff --git a/mpi_test/Makefile b/test/mpi_test/Makefile
similarity index 100%
rename from mpi_test/Makefile
rename to test/mpi_test/Makefile
diff --git a/mpi_test/test_gemm.c b/test/mpi_test/test_gemm.c
similarity index 100%
rename from mpi_test/test_gemm.c
rename to test/mpi_test/test_gemm.c
diff --git a/mpi_test/test_hemm.c b/test/mpi_test/test_hemm.c
similarity index 100%
rename from mpi_test/test_hemm.c
rename to test/mpi_test/test_hemm.c
diff --git a/mpi_test/test_her2k.c b/test/mpi_test/test_her2k.c
similarity index 100%
rename from mpi_test/test_her2k.c
rename to test/mpi_test/test_her2k.c
diff --git a/mpi_test/test_herk.c b/test/mpi_test/test_herk.c
similarity index 100%
rename from mpi_test/test_herk.c
rename to test/mpi_test/test_herk.c
diff --git a/mpi_test/test_trmm.c b/test/mpi_test/test_trmm.c
similarity index 100%
rename from mpi_test/test_trmm.c
rename to test/mpi_test/test_trmm.c
diff --git a/mpi_test/test_trsm.c b/test/mpi_test/test_trsm.c
similarity index 100%
rename from mpi_test/test_trsm.c
rename to test/mpi_test/test_trsm.c