Index: CloudConnect/config/CloudConnect.ini
===================================================================
diff -u -r51e99f2578e0901d9da91a4cb60d1b8858cfe971 -raaebfee335c74b0250864a6dce0555f866adadea
--- CloudConnect/config/CloudConnect.ini	(.../CloudConnect.ini)	(revision 51e99f2578e0901d9da91a4cb60d1b8858cfe971)
+++ CloudConnect/config/CloudConnect.ini	(.../CloudConnect.ini)	(revision aaebfee335c74b0250864a6dce0555f866adadea)
@@ -1,17 +1,17 @@
-[Socket]
-AppSocketName=/tmp/cloudconnect.sock
+[General]
+CanRoutingConfig=config/LeahiCanRouting.ini
 
-[Mqtt]
-ServerAddress=127.0.0.1
+[App]
+SocketName=/tmp/cloudconnect.sock
+
+[Cloud]
+; ServerAddress=127.0.0.1
+ServerAddress=a30gn2ua3sx6wx-ats.iot.us-east-1.amazonaws.com
 Port=8883
 TopicPrefix=diality/v1/devices
-; TODO: DeviceId should be sent by Leahi app or retrieved from somewhere else
-DeviceId=test_device
-CaFile=
-CertFile=
-KeyFile=
-
-; TODO: temporary for protobuf capture
-[Capture]
-SerFile=/home/leahi/Public/leahi-realtime-cdt/cloudconnect_protobuf.ser
-JsonFile=/home/leahi/Public/leahi-realtime-cdt/cloudconnect_protobuf.json
+ClientId=diality-test_device
+; TODO: SerialNumber should be sent by Leahi app or retrieved from somewhere else
+SerialNumber=diality-test_device
+CaFile=config/ssl/certs/AmazonRootCA1.pem
+CertFile=config/ssl/certs/device.crt
+KeyFile=config/ssl/private/device.key