diff --git a/ts/common/acmeFactory.ts b/ts/certificate/acme/acme-factory.ts
similarity index 100%
rename from ts/common/acmeFactory.ts
rename to ts/certificate/acme/acme-factory.ts
diff --git a/ts/smartproxy/classes.pp.certprovisioner.ts b/ts/certificate/providers/cert-provisioner.ts
similarity index 100%
rename from ts/smartproxy/classes.pp.certprovisioner.ts
rename to ts/certificate/providers/cert-provisioner.ts
diff --git a/ts/helpers.certificates.ts b/ts/certificate/utils/certificate-helpers.ts
similarity index 100%
rename from ts/helpers.certificates.ts
rename to ts/certificate/utils/certificate-helpers.ts
diff --git a/ts/port80handler/classes.port80handler.ts b/ts/http/port80/port80-handler.ts
similarity index 100%
rename from ts/port80handler/classes.port80handler.ts
rename to ts/http/port80/port80-handler.ts
diff --git a/ts/smartproxy/classes.pp.tlsalert.ts b/ts/tls/alerts/tls-alert.ts
similarity index 100%
rename from ts/smartproxy/classes.pp.tlsalert.ts
rename to ts/tls/alerts/tls-alert.ts
diff --git a/ts/smartproxy/classes.pp.snihandler.ts b/ts/tls/sni/sni-handler.ts
similarity index 100%
rename from ts/smartproxy/classes.pp.snihandler.ts
rename to ts/tls/sni/sni-handler.ts