diff --git a/broker-config/ca.crt b/config/ca.crt
similarity index 100%
rename from broker-config/ca.crt
rename to config/ca.crt
diff --git a/broker-config/mosquitto.conf b/config/mosquitto.conf
similarity index 100%
rename from broker-config/mosquitto.conf
rename to config/mosquitto.conf
diff --git a/broker-config/mqtt.example.com.crt b/config/mqtt.example.com.crt
similarity index 100%
rename from broker-config/mqtt.example.com.crt
rename to config/mqtt.example.com.crt
diff --git a/broker-config/mqtt.example.com.key b/config/mqtt.example.com.key
similarity index 100%
rename from broker-config/mqtt.example.com.key
rename to config/mqtt.example.com.key
diff --git a/sub-config/subscriber.crt b/config/subscriber.crt
similarity index 100%
rename from sub-config/subscriber.crt
rename to config/subscriber.crt
diff --git a/sub-config/subscriber.key b/config/subscriber.key
similarity index 100%
rename from sub-config/subscriber.key
rename to config/subscriber.key
diff --git a/sub-config/torch-sub.conf b/config/torch-sub.conf
similarity index 100%
rename from sub-config/torch-sub.conf
rename to config/torch-sub.conf
diff --git a/docker-compose.yml b/docker-compose.yml
index de17256..dab6181 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,7 @@ services:
     image: eclipse-mosquitto
     volumes:
       - broker_data:/mosquitto/data
-      - ./broker-config:/mosquitto/config
+      - ./config:/mosquitto/config:ro
     ports:
       - "1883:1883"
       - "8883:8883"
@@ -26,16 +26,16 @@ services:
   subscriber:
     build: './subscriber'
     volumes:
-      - sub_data:/data
-      - ./sub-config:/etc/torch
+      - client_data:/data
+      - ./config:/etc/torch:ro
     ports:
-      - "9999:8080"
+      - "7700:8080"
     networks:
       - broker_net
 
 volumes:
   broker_data:
-  sub_data:
+  client_data:
 
 networks:
   tor_net:
diff --git a/sub-config/ca.crt b/sub-config/ca.crt
deleted file mode 100644
index 8e79f74..0000000
--- a/sub-config/ca.crt
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID6zCCAtOgAwIBAgIUQJye5MbZVMpOpu87TmmlN/KOBj0wDQYJKoZIhvcNAQEL
-BQAwgYQxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJOWTERMA8GA1UEBwwITmV3IFlv
-cmsxFTATBgNVBAoMDEV4YW1wbGUgSW5jLjEcMBoGA1UEAwwTY2EubXF0dC5leGFt
-cGxlLmNvbTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5jb20wHhcNMjAx
-MDA2MTA1OTE4WhcNMzAxMDA0MTA1OTE4WjCBhDELMAkGA1UEBhMCVVMxCzAJBgNV
-BAgMAk5ZMREwDwYDVQQHDAhOZXcgWW9yazEVMBMGA1UECgwMRXhhbXBsZSBJbmMu
-MRwwGgYDVQQDDBNjYS5tcXR0LmV4YW1wbGUuY29tMSAwHgYJKoZIhvcNAQkBFhFh
-ZG1pbkBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALVndltaj3SX1zuJB0F5woIMUZCHopkgiO027/qE10IgM6SN4lFhR7wR0B/9PXrf
-zn1xTC63w9xd3GbnlJvcWhWbh/m1t2Qx2mIvOmoELY8wlY6/V6NzjSgju7mZi0u6
-aitU+LXINNuGS+JhVpc54QQ8M9o0jKlnNGnEmPjv6uhbNXx3f8lw3eqSr1ZqmpGd
-UQVYKsNYBVzSqsnh/sn/KnGYn/nmpsKRWeLhoslJ3zDjaM/Y4NYol11nWFIPYCk5
-7rzzxES/WdWLLnZ2W59YCT54YOGFqXE7oYgReD+Og2YwnGVQQpDcvb2HyIZL/2pa
-oC6avMo/eC8HbSxwUKCnj1cCAwEAAaNTMFEwHQYDVR0OBBYEFEC8a9l0rpIdUqCS
-i4NJwXlqUoLeMB8GA1UdIwQYMBaAFEC8a9l0rpIdUqCSi4NJwXlqUoLeMA8GA1Ud
-EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAGzxJWZdVozskr5yie2uetpL
-aAReCaHEdWudRN3wVW1Dpm2sE23x4VFiJ+Uow9k21GgtGUsAIFqRgb3/QO+ipODC
-GRwZmVopkuOaHfCz+tO8xqjvGHCidhhhNFdR9uVkWHoPKsQsvap0SSk12KMtFBRo
-3rmeQwPP4qEPFEwc2U0hCUMsIUvMSt3KrA/j+aMRzOXU7QIMFbcYEF1IaGJz1RMh
-h1VCXaUlL2liVTWU4XgudB8rMOuETec7un9hzoBVOWHxXdRrGPaoN4+zWiLRCDXO
-6wapOhkmTOXuZY/NcMMwTmdJKTEQBD6XIQamv91Ne2bT89LHpcp1LjbaCz+UAxg=
------END CERTIFICATE-----