diff --git a/SConstruct b/SConstruct
index 432bdb9..62c6470 100644
--- a/SConstruct
+++ b/SConstruct
@@ -244,6 +244,7 @@
                    certificate_checker.cc
                    chrome_browser_proxy_resolver.cc
                    chrome_proxy_resolver.cc
+                   connection_manager.cc
                    cycle_breaker.cc
                    dbus_service.cc
                    delta_diff_generator.cc
@@ -256,7 +257,6 @@
                    filesystem_iterator.cc
                    file_descriptor.cc
                    file_writer.cc
-                   flimflam_proxy.cc
                    full_update_generator.cc
                    gpio_handler.cc
                    graph_utils.cc
@@ -276,6 +276,7 @@
                    proxy_resolver.cc
                    simple_key_value_store.cc
                    subprocess.cc
+                   system_state.cc
                    tarjan.cc
                    terminator.cc
                    topological_sort.cc
@@ -292,6 +293,7 @@
                             certificate_checker_unittest.cc
                             chrome_browser_proxy_resolver_unittest.cc
                             chrome_proxy_resolver_unittest.cc
+                            connection_manager_unittest.cc
                             cycle_breaker_unittest.cc
                             delta_diff_generator_unittest.cc
                             delta_performer_unittest.cc
@@ -302,7 +304,6 @@
                             file_writer_unittest.cc
                             filesystem_copier_action_unittest.cc
                             filesystem_iterator_unittest.cc
-                            flimflam_proxy_unittest.cc
                             full_update_generator_unittest.cc
                             gpio_handler_unittest.cc
                             gpio_mock_udev_interface.cc