diff --git a/platform-independent/c/cli/CMakeLists.txt b/platform-independent/c/cli/CMakeLists.txt
index 26df69dd..633ec56a 100644
--- a/platform-independent/c/cli/CMakeLists.txt
+++ b/platform-independent/c/cli/CMakeLists.txt
@@ -123,8 +123,9 @@ endfunction()
 ### TARGET: MPW
 if( BUILD_MPW )
     # target
-    add_executable( mpw "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c" "../core/src/mpw-types.c" "../core/src/mpw-util.c"
-                        "../core/src/mpw-marshal-util.c" "../core/src/mpw-marshal.c"
+    add_executable( mpw "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c"
+                        "../core/src/mpw-algorithm_v0.c" "../core/src/mpw-algorithm_v1.c" "../core/src/mpw-algorithm_v2.c" "../core/src/mpw-algorithm_v3.c"
+                        "../core/src/mpw-types.c" "../core/src/mpw-util.c" "../core/src/mpw-marshal-util.c" "../core/src/mpw-marshal.c"
                         "src/mpw-cli-util.c" "src/mpw-cli.c" )
     target_include_directories( mpw PUBLIC ../core/src src )
     install( TARGETS mpw RUNTIME DESTINATION bin )
@@ -139,8 +140,9 @@ endif()
 ### TARGET: MPW-BENCH
 if( BUILD_MPW_BENCH )
     # target
-    add_executable( mpw-bench "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c" "../core/src/mpw-types.c" "../core/src/mpw-util.c"
-                              "src/mpw-bench.c" )
+    add_executable( mpw-bench "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c"
+                              "../core/src/mpw-algorithm_v0.c" "../core/src/mpw-algorithm_v1.c" "../core/src/mpw-algorithm_v2.c" "../core/src/mpw-algorithm_v3.c"
+                              "../core/src/mpw-types.c" "../core/src/mpw-util.c" "src/mpw-bench.c" )
     target_include_directories( mpw-bench PUBLIC ../core/src src )
     install( TARGETS mpw-bench RUNTIME DESTINATION bin )
 
@@ -152,8 +154,9 @@ endif()
 ### TARGET: MPW-TESTS
 if( BUILD_MPW_TESTS )
     # target
-    add_executable( mpw-tests "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c" "../core/src/mpw-types.c" "../core/src/mpw-util.c"
-                              "src/mpw-tests-util.c" "src/mpw-tests.c" )
+    add_executable( mpw-tests "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c"
+                              "../core/src/mpw-algorithm_v0.c" "../core/src/mpw-algorithm_v1.c" "../core/src/mpw-algorithm_v2.c" "../core/src/mpw-algorithm_v3.c"
+                              "../core/src/mpw-types.c" "../core/src/mpw-util.c" "src/mpw-tests-util.c" "src/mpw-tests.c" )
     target_include_directories( mpw-tests PUBLIC ../core/src src )
     install( TARGETS mpw-tests RUNTIME DESTINATION bin )
 
diff --git a/platform-independent/c/cli/build b/platform-independent/c/cli/build
index cca35eca..9098221e 100755
--- a/platform-independent/c/cli/build
+++ b/platform-independent/c/cli/build
@@ -100,8 +100,9 @@ mpw() {
 
     # build
     cc "${cflags[@]}" "$@" \
-       "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c" "../core/src/mpw-types.c" "../core/src/mpw-util.c" \
-       "../core/src/mpw-marshal-util.c" "../core/src/mpw-marshal.c" "src/mpw-cli-util.c" \
+       "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c" \
+       "../core/src/mpw-algorithm_v0.c" "../core/src/mpw-algorithm_v1.c" "../core/src/mpw-algorithm_v2.c" "../core/src/mpw-algorithm_v3.c" \
+       "../core/src/mpw-types.c" "../core/src/mpw-util.c" "../core/src/mpw-marshal-util.c" "../core/src/mpw-marshal.c" "src/mpw-cli-util.c" \
        "${ldflags[@]}" "src/mpw-cli.c" -o "mpw"
     echo "done!  You can now run ./mpw-cli-tests, ./install or use ./$_"
 }
@@ -125,7 +126,9 @@ mpw-bench() {
 
     # build
     cc "${cflags[@]}" "$@" \
-       "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c" "../core/src/mpw-types.c" "../core/src/mpw-util.c" \
+       "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c" \
+       "../core/src/mpw-algorithm_v0.c" "../core/src/mpw-algorithm_v1.c" "../core/src/mpw-algorithm_v2.c" "../core/src/mpw-algorithm_v3.c" \
+       "../core/src/mpw-types.c" "../core/src/mpw-util.c" \
        "${ldflags[@]}" "src/mpw-bench.c" -o "mpw-bench"
     echo "done!  You can now use ./$_"
 }
@@ -150,7 +153,9 @@ mpw-tests() {
 
     # build
     cc "${cflags[@]}" "$@" \
-        "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c" "../core/src/mpw-types.c" "../core/src/mpw-util.c" "src/mpw-tests-util.c" \
+       "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c" \
+       "../core/src/mpw-algorithm_v0.c" "../core/src/mpw-algorithm_v1.c" "../core/src/mpw-algorithm_v2.c" "../core/src/mpw-algorithm_v3.c" \
+       "../core/src/mpw-types.c" "../core/src/mpw-util.c" "src/mpw-tests-util.c" \
        "${ldflags[@]}" "src/mpw-tests.c" -o "mpw-tests"
     echo "done!  You can now use ./$_"
 }