diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9935b97..cae87aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,12 @@
   - `quick_test.py` - Quick validation script for basic functionality
   - Support for verbose output, JSON output, and specific test categories
   - **100% SUCCESS RATE ACHIEVED** - All 24 integration tests passing
+<<<<<<< HEAD
+=======
+- Modularized all CLI commands into separate modules under `client/commands/`.
+- Each command module now exports `setup_parser` and `run` functions for consistency.
+- Comprehensive test script for client CLI refactor.
+>>>>>>> 9070ae3 (feat: add changelog, docs, and update various scripts for modular CLI milestone)
 
 ### Fixed
 - **D-Bus Method Registration**: Added missing methods to AptOstreeSysrootInterface
@@ -40,6 +46,14 @@
   - ✅ Error Handling (2/2 tests)
   - ✅ Performance (2/2 tests)
   - ✅ Security (1/1 test)
+<<<<<<< HEAD
+=======
+- Updated `client/main.py` to delegate to command modules and use new D-Bus interface.
+- Fixed imports in `client/commands/__init__.py` to import modules, not symbols.
+- Standardized command execution function to `run` in all modules.
+- Updated D-Bus mocks in tests to return dicts, not JSON strings.
+- Fixed test script to call `module.run()` and check for both `run` and `setup_parser`.
+>>>>>>> 9070ae3 (feat: add changelog, docs, and update various scripts for modular CLI milestone)
 
 ### Technical Details
 - **Test Infrastructure**: Production-ready testing framework with proper error handling
diff --git a/TODO.md b/TODO.md
index 7c10828..1e6561f 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,7 +1,10 @@
-# Particle-OS Tools TODO
+# TODO
 
-## Completed ✅
+## Completed
+- Refactor CLI to modular command structure (each command in its own module, with run/setup_parser)
+- Fix imports and test script for modular pattern
 
+<<<<<<< HEAD
 - ✅ **Systemd Service Name Consistency**: Renamed and updated all references from `apt-ostree.service` to `apt-ostreed.service` for correct systemd and D-Bus integration
 - ✅ **D-Bus Signal Emission**: Fixed all dbus-next signal emission calls to use direct function calls instead of `.emit()`, resolving 'function object has no attribute emit' errors
 - ✅ **apt-layer.sh Integration**: Updated apt-layer.sh and related scriptlets to use the correct service name and ensure proper daemon status detection and management
@@ -474,4 +477,10 @@
 - **Root Privileges**: ✅ Confirmed working for daemon operations
 - **OSTree Dependency**: ✅ Installed and working
 - **D-Bus Properties**: ✅ All serialization issues resolved
-- **Daemon Startup**: ✅ Successfully starting and publishing interfaces
\ No newline at end of file
+- **Daemon Startup**: ✅ Successfully starting and publishing interfaces
+=======
+## In Progress / Next Steps
+- Write integration tests for the CLI and daemon (real D-Bus communication)
+- Begin work on single-binary packaging for apt-ostree (PyInstaller, shiv, or pex)
+- Expand and update documentation for the new modular CLI and developer onboarding
+>>>>>>> 9070ae3 (feat: add changelog, docs, and update various scripts for modular CLI milestone)
diff --git a/apt-layer.sh b/apt-layer.sh
old mode 100755
new mode 100644
diff --git a/restart_daemon.sh b/restart_daemon.sh
old mode 100755
new mode 100644
diff --git a/run_integration_tests.sh b/run_integration_tests.sh
old mode 100755
new mode 100644
diff --git a/src/apt-layer/compile-installer.sh b/src/apt-layer/compile-installer.sh
old mode 100755
new mode 100644
diff --git a/src/apt-layer/compile.sh b/src/apt-layer/compile.sh
old mode 100755
new mode 100644
diff --git a/test_dbus_methods.sh b/test_dbus_methods.sh
old mode 100755
new mode 100644
diff --git a/test_dbus_signals.sh b/test_dbus_signals.sh
old mode 100755
new mode 100644
diff --git a/update_daemon.sh b/update_daemon.sh
old mode 100755
new mode 100644