diff --git a/certs/ca/certs/ca.cert.pem b/ca/certs/ca.cert.pem
similarity index 100%
rename from certs/ca/certs/ca.cert.pem
rename to ca/certs/ca.cert.pem
diff --git a/certs/ca/index.txt b/ca/index.txt
similarity index 100%
rename from certs/ca/index.txt
rename to ca/index.txt
diff --git a/certs/ca/index.txt.attr b/ca/index.txt.attr
similarity index 100%
rename from certs/ca/index.txt.attr
rename to ca/index.txt.attr
diff --git a/certs/ca/index.txt.attr.old b/ca/index.txt.attr.old
similarity index 100%
rename from certs/ca/index.txt.attr.old
rename to ca/index.txt.attr.old
diff --git a/certs/ca/index.txt.old b/ca/index.txt.old
similarity index 100%
rename from certs/ca/index.txt.old
rename to ca/index.txt.old
diff --git a/certs/ca/intermediate/certs/bibi.ch.cert.pem b/ca/intermediate/certs/bibi.ch.cert.pem
similarity index 100%
rename from certs/ca/intermediate/certs/bibi.ch.cert.pem
rename to ca/intermediate/certs/bibi.ch.cert.pem
diff --git a/certs/ca/intermediate/certs/ca-chain.cert.pem b/ca/intermediate/certs/ca-chain.cert.pem
similarity index 100%
rename from certs/ca/intermediate/certs/ca-chain.cert.pem
rename to ca/intermediate/certs/ca-chain.cert.pem
diff --git a/certs/ca/intermediate/certs/intermediate.cert.pem b/ca/intermediate/certs/intermediate.cert.pem
similarity index 100%
rename from certs/ca/intermediate/certs/intermediate.cert.pem
rename to ca/intermediate/certs/intermediate.cert.pem
diff --git a/certs/ca/intermediate/csr/andrewtate.ch.csr.pem b/ca/intermediate/csr/andrewtate.ch.csr.pem
similarity index 100%
rename from certs/ca/intermediate/csr/andrewtate.ch.csr.pem
rename to ca/intermediate/csr/andrewtate.ch.csr.pem
diff --git a/certs/ca/intermediate/csr/bibi.ch.csr.pem b/ca/intermediate/csr/bibi.ch.csr.pem
similarity index 100%
rename from certs/ca/intermediate/csr/bibi.ch.csr.pem
rename to ca/intermediate/csr/bibi.ch.csr.pem
diff --git a/certs/ca/intermediate/csr/intermediate.csr.pem b/ca/intermediate/csr/intermediate.csr.pem
similarity index 100%
rename from certs/ca/intermediate/csr/intermediate.csr.pem
rename to ca/intermediate/csr/intermediate.csr.pem
diff --git a/certs/ca/intermediate/index.txt b/ca/intermediate/index.txt
similarity index 100%
rename from certs/ca/intermediate/index.txt
rename to ca/intermediate/index.txt
diff --git a/certs/ca/intermediate/index.txt.attr b/ca/intermediate/index.txt.attr
similarity index 100%
rename from certs/ca/intermediate/index.txt.attr
rename to ca/intermediate/index.txt.attr
diff --git a/certs/ca/intermediate/index.txt.attr.old b/ca/intermediate/index.txt.attr.old
similarity index 100%
rename from certs/ca/intermediate/index.txt.attr.old
rename to ca/intermediate/index.txt.attr.old
diff --git a/certs/ca/intermediate/index.txt.old b/ca/intermediate/index.txt.old
similarity index 100%
rename from certs/ca/intermediate/index.txt.old
rename to ca/intermediate/index.txt.old
diff --git a/certs/ca/intermediate/newcerts/1000.pem b/ca/intermediate/newcerts/1000.pem
similarity index 100%
rename from certs/ca/intermediate/newcerts/1000.pem
rename to ca/intermediate/newcerts/1000.pem
diff --git a/certs/ca/intermediate/newcerts/1001.pem b/ca/intermediate/newcerts/1001.pem
similarity index 100%
rename from certs/ca/intermediate/newcerts/1001.pem
rename to ca/intermediate/newcerts/1001.pem
diff --git a/certs/ca/intermediate/openssl.cnf b/ca/intermediate/openssl.cnf
similarity index 98%
rename from certs/ca/intermediate/openssl.cnf
rename to ca/intermediate/openssl.cnf
index 520a0a9d961a4ba864fb2e340915b6e873c3a8e1..0217615b41b823d1c296419976dc09ba81fabf61 100644
--- a/certs/ca/intermediate/openssl.cnf
+++ b/ca/intermediate/openssl.cnf
@@ -122,6 +122,7 @@ keyUsage = critical, nonRepudiation, digitalSignature, keyEncipherment
 extendedKeyUsage = serverAuth
 authorityInfoAccess = OCSP;URI:http://ocsp2.example.com
 subjectAltName = @alt_names
+crlDistributionPoints = URI:http://bibi.ch/intermediate.crl.pem
 
 [ alt_names ]
 DNS.1 = bibi.ch
diff --git a/certs/ca/intermediate/private/andrewtate.ch.key.pem b/ca/intermediate/private/andrewtate.ch.key.pem
similarity index 100%
rename from certs/ca/intermediate/private/andrewtate.ch.key.pem
rename to ca/intermediate/private/andrewtate.ch.key.pem
diff --git a/certs/ca/intermediate/private/intermediate.key.pem b/ca/intermediate/private/intermediate.key.pem
similarity index 100%
rename from certs/ca/intermediate/private/intermediate.key.pem
rename to ca/intermediate/private/intermediate.key.pem
diff --git a/certs/ca/intermediate/serial b/ca/intermediate/serial
similarity index 100%
rename from certs/ca/intermediate/serial
rename to ca/intermediate/serial
diff --git a/certs/ca/intermediate/serial.old b/ca/intermediate/serial.old
similarity index 100%
rename from certs/ca/intermediate/serial.old
rename to ca/intermediate/serial.old
diff --git a/certs/ca/newcerts/1000.pem b/ca/newcerts/1000.pem
similarity index 100%
rename from certs/ca/newcerts/1000.pem
rename to ca/newcerts/1000.pem
diff --git a/certs/ca/newcerts/1001.pem b/ca/newcerts/1001.pem
similarity index 100%
rename from certs/ca/newcerts/1001.pem
rename to ca/newcerts/1001.pem
diff --git a/certs/ca/openssl.cnf b/ca/openssl.cnf
similarity index 100%
rename from certs/ca/openssl.cnf
rename to ca/openssl.cnf
diff --git a/certs/ca/private/ca.key.pem b/ca/private/ca.key.pem
similarity index 100%
rename from certs/ca/private/ca.key.pem
rename to ca/private/ca.key.pem
diff --git a/certs/ca/serial b/ca/serial
similarity index 100%
rename from certs/ca/serial
rename to ca/serial
diff --git a/certs/ca/serial.old b/ca/serial.old
similarity index 100%
rename from certs/ca/serial.old
rename to ca/serial.old
diff --git a/full_chain.pem b/full_chain.pem
index ec80b1a7229906b89e7f068cb308e449072e531e..dd2ab75e3ec14c99b06bd07aaff18a4bd548ef9e 100644
--- a/full_chain.pem
+++ b/full_chain.pem
@@ -1,8 +1,8 @@
 -----BEGIN CERTIFICATE-----
-MIIElzCCAn+gAwIBAgIUfyoibwTPz40aYxk3lx1HRXMS37QwDQYJKoZIhvcNAQEL
+MIIElzCCAn+gAwIBAgIUCPlRQLy/Sh2+/US9YJTB+zvLbdswDQYJKoZIhvcNAQEL
 BQAwXjELMAkGA1UEBhMCQ0gxDTALBgNVBAgMBFZhdWQxGjAYBgNVBAoMEUhvcnNl
 IFRpbmRlciBTYXJsMQwwCgYDVQQLDANJU0MxFjAUBgNVBAMMDWFuZHJld3RhdGUu
-Y2gwHhcNMjQwNjE4MTY0NzI0WhcNMjUwNjE4MTY0NzI0WjBbMQswCQYDVQQGEwJD
+Y2gwHhcNMjQwNjE4MTg1NzExWhcNMjUwNjE4MTg1NzExWjBbMQswCQYDVQQGEwJD
 SDEPMA0GA1UECAwGR2VuZXZhMQ8wDQYDVQQHDAZHZW5ldmExEDAOBgNVBAoMB0Nv
 bXBhbnkxGDAWBgNVBAMMD2NvbXBhbnkuYmliaS5jaDCCASIwDQYJKoZIhvcNAQEB
 BQADggEPADCCAQoCggEBAK+IC/2VqLLJ/PzzWeV2dbsvxUIrg26UJZnxJ5FlK1tg
@@ -12,18 +12,18 @@ etgMp4zQ4UNDZjECzsQ46Hp3WqpdeAVxFxblfDPlrVBnAdWnlbBdZ3798XHDOvDX
 Josmoc8DnWkkiVOmL0KFKw9R7dAhWyTXnVojqotPxGZPbDwwPv0QSaSsolrPQ9x4
 BOSf/QgZKQXW0Q35UgDT0bzT+wIyUezu3prJRd/2oIsCAwEAAaNQME4wHQYDVR0O
 BBYEFJbDmkp+DYOTwK255fK13gEd1u15MB8GA1UdIwQYMBaAFN6ATyzm7FYoUHlX
-5afUB9g9RLGTMAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggIBABrE4lRC
-5ib2dY/xG1Cf3EeBQtOlqNIZ4p+ziweBsHCffhJAroTojneuHd8yXjJk1mbVOGqe
-o5mVqCu30h33LfqoZQbnHKWAdc3C3oBmWrTp/NpUS9Swz/HHgRu26HnuLBXlG1ZD
-fxoBRD1PFxpLyHLxiNEWTofC/jo0UuOEIGsVyMs87WiYchbzwbk3XpF8ItZ1PUjf
-GV0j5P5OuIocRFVVfdPLsifKBsyUmZR0dORHif2+9XKbBJPWptF4PgmBqWFCKLev
-pMWBNbQCqAjFzZTXw6sOabACAuaspVigqSC7qJ3bOkIUsnh8YzFlyv44YHCYpDxW
-vHcnMrDkQ9Hrs3UpIiewyFKyzv4gLpsEm+I1jcxLLUh1lvLH7ZBVQf4U+wjcBLij
-CsMmXi83qXsiIuWfTjn3F+UKpmDy3c4C/Vst4shdu3F7xOxljU3p5RzEi3qQPYMc
-UrAHnnwoaaRAz3k7zl9p6u0RbIZavYkZAyoMGne1ynaphIb2AJFHBUsldRAUGR26
-2IKDLfeoQPOERmifKAJ2QSHgLribQKWDH4wL6fwCKJNFnedpSeh35I79NyE+icMh
-8NvB/H52KLkc0P+J8lBPIJ3fJVuSlgeVqa8EgZg/Kucf0WH3YdBaJ+USaiYkWiJh
-o93HAye1hrAzzTR+9qghzOPrSHMUwJXY7af7
+5afUB9g9RLGTMAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggIBAAMgdzDm
+APOTu/UwuZPeTBY8qwkG74omNSG/8Yrz0XG8bYIBwFITvigbaPhMqOpSaztODiE2
+KLl4B58087M5UYHaDjv1O2Ps6KepOyUqPi3VWIplrUJYGk23Xe252fL5HbgSTsTK
+QFl6k/YMvw5YPNILRm3YP9Ud0KeSGJkE8/HGzyFChmGMwhgez1XhUjs8+PftCrf9
+xAZHigy8stkwU/Jwa0KfyxepF898AV9DEaVzJt4b+pM8BAWKWRTM+ioOjqL5z3b3
+TdRg8g8b8bfKEAotgy1S7SOZd5k0t/osp+rn97BwmK2VjkUGa4MLlQzz4Po4UGAc
+s1mHPpoigjTaHilH9UL2ByavGgK2bEIK3hkht/MYzqPJrOyT9QaJ9xU9j/syLQPA
+86qQ03Wo40QPZj91lLbZianiw4c2WXYDcpSD4exAOXSfVtaey3rvkbnVNR9uKigs
+Npm38Fbr6adNKWD+klwDzS4BEcUFcJsh68rzNW5hNM26dp4r3dajxumPg5RD+9yu
+iG+WlvonDoHFXIrtXcT9vSUGuoDOp0V3BpB9cBV8MGN7f5ROdMGJSf6BlBuNe0/c
+FUnbxtzct3uDQyCDn67xhZ3UMcjsU3ithRnuJbLfOaJEFEQqw/3qMD8ABrTudmHX
+5SVV97xuOTyQUgeCqA32JnBzWdXWB69HAOdk
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIFsDCCA5igAwIBAgICEAEwDQYJKoZIhvcNAQELBQAwcDEXMBUGA1UEAwwOaG9y
diff --git a/newcompany/certs/out.pem b/newcompany/certs/out.pem
index 06983db914841e390f75a1a22d8cae8210d27191..8bb40a2e0a0ec918eeae21579188d1d1e3e0aad2 100644
--- a/newcompany/certs/out.pem
+++ b/newcompany/certs/out.pem
@@ -1,8 +1,8 @@
 -----BEGIN CERTIFICATE-----
-MIIElzCCAn+gAwIBAgIUfyoibwTPz40aYxk3lx1HRXMS37QwDQYJKoZIhvcNAQEL
+MIIElzCCAn+gAwIBAgIUCPlRQLy/Sh2+/US9YJTB+zvLbdswDQYJKoZIhvcNAQEL
 BQAwXjELMAkGA1UEBhMCQ0gxDTALBgNVBAgMBFZhdWQxGjAYBgNVBAoMEUhvcnNl
 IFRpbmRlciBTYXJsMQwwCgYDVQQLDANJU0MxFjAUBgNVBAMMDWFuZHJld3RhdGUu
-Y2gwHhcNMjQwNjE4MTY0NzI0WhcNMjUwNjE4MTY0NzI0WjBbMQswCQYDVQQGEwJD
+Y2gwHhcNMjQwNjE4MTg1NzExWhcNMjUwNjE4MTg1NzExWjBbMQswCQYDVQQGEwJD
 SDEPMA0GA1UECAwGR2VuZXZhMQ8wDQYDVQQHDAZHZW5ldmExEDAOBgNVBAoMB0Nv
 bXBhbnkxGDAWBgNVBAMMD2NvbXBhbnkuYmliaS5jaDCCASIwDQYJKoZIhvcNAQEB
 BQADggEPADCCAQoCggEBAK+IC/2VqLLJ/PzzWeV2dbsvxUIrg26UJZnxJ5FlK1tg
@@ -12,16 +12,16 @@ etgMp4zQ4UNDZjECzsQ46Hp3WqpdeAVxFxblfDPlrVBnAdWnlbBdZ3798XHDOvDX
 Josmoc8DnWkkiVOmL0KFKw9R7dAhWyTXnVojqotPxGZPbDwwPv0QSaSsolrPQ9x4
 BOSf/QgZKQXW0Q35UgDT0bzT+wIyUezu3prJRd/2oIsCAwEAAaNQME4wHQYDVR0O
 BBYEFJbDmkp+DYOTwK255fK13gEd1u15MB8GA1UdIwQYMBaAFN6ATyzm7FYoUHlX
-5afUB9g9RLGTMAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggIBABrE4lRC
-5ib2dY/xG1Cf3EeBQtOlqNIZ4p+ziweBsHCffhJAroTojneuHd8yXjJk1mbVOGqe
-o5mVqCu30h33LfqoZQbnHKWAdc3C3oBmWrTp/NpUS9Swz/HHgRu26HnuLBXlG1ZD
-fxoBRD1PFxpLyHLxiNEWTofC/jo0UuOEIGsVyMs87WiYchbzwbk3XpF8ItZ1PUjf
-GV0j5P5OuIocRFVVfdPLsifKBsyUmZR0dORHif2+9XKbBJPWptF4PgmBqWFCKLev
-pMWBNbQCqAjFzZTXw6sOabACAuaspVigqSC7qJ3bOkIUsnh8YzFlyv44YHCYpDxW
-vHcnMrDkQ9Hrs3UpIiewyFKyzv4gLpsEm+I1jcxLLUh1lvLH7ZBVQf4U+wjcBLij
-CsMmXi83qXsiIuWfTjn3F+UKpmDy3c4C/Vst4shdu3F7xOxljU3p5RzEi3qQPYMc
-UrAHnnwoaaRAz3k7zl9p6u0RbIZavYkZAyoMGne1ynaphIb2AJFHBUsldRAUGR26
-2IKDLfeoQPOERmifKAJ2QSHgLribQKWDH4wL6fwCKJNFnedpSeh35I79NyE+icMh
-8NvB/H52KLkc0P+J8lBPIJ3fJVuSlgeVqa8EgZg/Kucf0WH3YdBaJ+USaiYkWiJh
-o93HAye1hrAzzTR+9qghzOPrSHMUwJXY7af7
+5afUB9g9RLGTMAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggIBAAMgdzDm
+APOTu/UwuZPeTBY8qwkG74omNSG/8Yrz0XG8bYIBwFITvigbaPhMqOpSaztODiE2
+KLl4B58087M5UYHaDjv1O2Ps6KepOyUqPi3VWIplrUJYGk23Xe252fL5HbgSTsTK
+QFl6k/YMvw5YPNILRm3YP9Ud0KeSGJkE8/HGzyFChmGMwhgez1XhUjs8+PftCrf9
+xAZHigy8stkwU/Jwa0KfyxepF898AV9DEaVzJt4b+pM8BAWKWRTM+ioOjqL5z3b3
+TdRg8g8b8bfKEAotgy1S7SOZd5k0t/osp+rn97BwmK2VjkUGa4MLlQzz4Po4UGAc
+s1mHPpoigjTaHilH9UL2ByavGgK2bEIK3hkht/MYzqPJrOyT9QaJ9xU9j/syLQPA
+86qQ03Wo40QPZj91lLbZianiw4c2WXYDcpSD4exAOXSfVtaey3rvkbnVNR9uKigs
+Npm38Fbr6adNKWD+klwDzS4BEcUFcJsh68rzNW5hNM26dp4r3dajxumPg5RD+9yu
+iG+WlvonDoHFXIrtXcT9vSUGuoDOp0V3BpB9cBV8MGN7f5ROdMGJSf6BlBuNe0/c
+FUnbxtzct3uDQyCDn67xhZ3UMcjsU3ithRnuJbLfOaJEFEQqw/3qMD8ABrTudmHX
+5SVV97xuOTyQUgeCqA32JnBzWdXWB69HAOdk
 -----END CERTIFICATE-----