diff --git a/extensions/app-provider/Makefile b/services/app-provider/Makefile
similarity index 100%
rename from extensions/app-provider/Makefile
rename to services/app-provider/Makefile
diff --git a/extensions/app-provider/cmd/app-provider/main.go b/services/app-provider/cmd/app-provider/main.go
similarity index 100%
rename from extensions/app-provider/cmd/app-provider/main.go
rename to services/app-provider/cmd/app-provider/main.go
diff --git a/extensions/app-provider/pkg/command/health.go b/services/app-provider/pkg/command/health.go
similarity index 100%
rename from extensions/app-provider/pkg/command/health.go
rename to services/app-provider/pkg/command/health.go
diff --git a/extensions/app-provider/pkg/command/root.go b/services/app-provider/pkg/command/root.go
similarity index 100%
rename from extensions/app-provider/pkg/command/root.go
rename to services/app-provider/pkg/command/root.go
diff --git a/extensions/app-provider/pkg/command/server.go b/services/app-provider/pkg/command/server.go
similarity index 100%
rename from extensions/app-provider/pkg/command/server.go
rename to services/app-provider/pkg/command/server.go
diff --git a/extensions/app-provider/pkg/command/version.go b/services/app-provider/pkg/command/version.go
similarity index 100%
rename from extensions/app-provider/pkg/command/version.go
rename to services/app-provider/pkg/command/version.go
diff --git a/extensions/app-provider/pkg/config/config.go b/services/app-provider/pkg/config/config.go
similarity index 100%
rename from extensions/app-provider/pkg/config/config.go
rename to services/app-provider/pkg/config/config.go
diff --git a/extensions/app-provider/pkg/config/defaults/defaultconfig.go b/services/app-provider/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/app-provider/pkg/config/defaults/defaultconfig.go
rename to services/app-provider/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/app-provider/pkg/config/parser/parse.go b/services/app-provider/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/app-provider/pkg/config/parser/parse.go
rename to services/app-provider/pkg/config/parser/parse.go
diff --git a/extensions/app-provider/pkg/config/reva.go b/services/app-provider/pkg/config/reva.go
similarity index 100%
rename from extensions/app-provider/pkg/config/reva.go
rename to services/app-provider/pkg/config/reva.go
diff --git a/extensions/app-provider/pkg/logging/logging.go b/services/app-provider/pkg/logging/logging.go
similarity index 100%
rename from extensions/app-provider/pkg/logging/logging.go
rename to services/app-provider/pkg/logging/logging.go
diff --git a/extensions/app-provider/pkg/revaconfig/config.go b/services/app-provider/pkg/revaconfig/config.go
similarity index 100%
rename from extensions/app-provider/pkg/revaconfig/config.go
rename to services/app-provider/pkg/revaconfig/config.go
diff --git a/extensions/app-provider/pkg/server/debug/option.go b/services/app-provider/pkg/server/debug/option.go
similarity index 100%
rename from extensions/app-provider/pkg/server/debug/option.go
rename to services/app-provider/pkg/server/debug/option.go
diff --git a/extensions/app-provider/pkg/server/debug/server.go b/services/app-provider/pkg/server/debug/server.go
similarity index 100%
rename from extensions/app-provider/pkg/server/debug/server.go
rename to services/app-provider/pkg/server/debug/server.go
diff --git a/extensions/app-provider/pkg/tracing/tracing.go b/services/app-provider/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/app-provider/pkg/tracing/tracing.go
rename to services/app-provider/pkg/tracing/tracing.go
diff --git a/extensions/app-registry/Makefile b/services/app-registry/Makefile
similarity index 100%
rename from extensions/app-registry/Makefile
rename to services/app-registry/Makefile
diff --git a/extensions/app-registry/cmd/app-registry/main.go b/services/app-registry/cmd/app-registry/main.go
similarity index 100%
rename from extensions/app-registry/cmd/app-registry/main.go
rename to services/app-registry/cmd/app-registry/main.go
diff --git a/extensions/app-registry/pkg/command/health.go b/services/app-registry/pkg/command/health.go
similarity index 100%
rename from extensions/app-registry/pkg/command/health.go
rename to services/app-registry/pkg/command/health.go
diff --git a/extensions/app-registry/pkg/command/root.go b/services/app-registry/pkg/command/root.go
similarity index 100%
rename from extensions/app-registry/pkg/command/root.go
rename to services/app-registry/pkg/command/root.go
diff --git a/extensions/app-registry/pkg/command/server.go b/services/app-registry/pkg/command/server.go
similarity index 100%
rename from extensions/app-registry/pkg/command/server.go
rename to services/app-registry/pkg/command/server.go
diff --git a/extensions/app-registry/pkg/command/version.go b/services/app-registry/pkg/command/version.go
similarity index 100%
rename from extensions/app-registry/pkg/command/version.go
rename to services/app-registry/pkg/command/version.go
diff --git a/extensions/app-registry/pkg/config/config.go b/services/app-registry/pkg/config/config.go
similarity index 100%
rename from extensions/app-registry/pkg/config/config.go
rename to services/app-registry/pkg/config/config.go
diff --git a/extensions/app-registry/pkg/config/defaults/defaultconfig.go b/services/app-registry/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/app-registry/pkg/config/defaults/defaultconfig.go
rename to services/app-registry/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/app-registry/pkg/config/parser/parse.go b/services/app-registry/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/app-registry/pkg/config/parser/parse.go
rename to services/app-registry/pkg/config/parser/parse.go
diff --git a/extensions/app-registry/pkg/config/reva.go b/services/app-registry/pkg/config/reva.go
similarity index 100%
rename from extensions/app-registry/pkg/config/reva.go
rename to services/app-registry/pkg/config/reva.go
diff --git a/extensions/app-registry/pkg/logging/logging.go b/services/app-registry/pkg/logging/logging.go
similarity index 100%
rename from extensions/app-registry/pkg/logging/logging.go
rename to services/app-registry/pkg/logging/logging.go
diff --git a/extensions/app-registry/pkg/revaconfig/config.go b/services/app-registry/pkg/revaconfig/config.go
similarity index 100%
rename from extensions/app-registry/pkg/revaconfig/config.go
rename to services/app-registry/pkg/revaconfig/config.go
diff --git a/extensions/app-registry/pkg/server/debug/option.go b/services/app-registry/pkg/server/debug/option.go
similarity index 100%
rename from extensions/app-registry/pkg/server/debug/option.go
rename to services/app-registry/pkg/server/debug/option.go
diff --git a/extensions/app-registry/pkg/server/debug/server.go b/services/app-registry/pkg/server/debug/server.go
similarity index 100%
rename from extensions/app-registry/pkg/server/debug/server.go
rename to services/app-registry/pkg/server/debug/server.go
diff --git a/extensions/app-registry/pkg/tracing/tracing.go b/services/app-registry/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/app-registry/pkg/tracing/tracing.go
rename to services/app-registry/pkg/tracing/tracing.go
diff --git a/extensions/audit/Makefile b/services/audit/Makefile
similarity index 100%
rename from extensions/audit/Makefile
rename to services/audit/Makefile
diff --git a/extensions/audit/cmd/audit/main.go b/services/audit/cmd/audit/main.go
similarity index 100%
rename from extensions/audit/cmd/audit/main.go
rename to services/audit/cmd/audit/main.go
diff --git a/extensions/audit/pkg/command/health.go b/services/audit/pkg/command/health.go
similarity index 100%
rename from extensions/audit/pkg/command/health.go
rename to services/audit/pkg/command/health.go
diff --git a/extensions/audit/pkg/command/root.go b/services/audit/pkg/command/root.go
similarity index 100%
rename from extensions/audit/pkg/command/root.go
rename to services/audit/pkg/command/root.go
diff --git a/extensions/audit/pkg/command/server.go b/services/audit/pkg/command/server.go
similarity index 100%
rename from extensions/audit/pkg/command/server.go
rename to services/audit/pkg/command/server.go
diff --git a/extensions/audit/pkg/command/version.go b/services/audit/pkg/command/version.go
similarity index 100%
rename from extensions/audit/pkg/command/version.go
rename to services/audit/pkg/command/version.go
diff --git a/extensions/audit/pkg/config/config.go b/services/audit/pkg/config/config.go
similarity index 100%
rename from extensions/audit/pkg/config/config.go
rename to services/audit/pkg/config/config.go
diff --git a/extensions/audit/pkg/config/debug.go b/services/audit/pkg/config/debug.go
similarity index 100%
rename from extensions/audit/pkg/config/debug.go
rename to services/audit/pkg/config/debug.go
diff --git a/extensions/audit/pkg/config/defaults/defaultconfig.go b/services/audit/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/audit/pkg/config/defaults/defaultconfig.go
rename to services/audit/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/audit/pkg/config/log.go b/services/audit/pkg/config/log.go
similarity index 100%
rename from extensions/audit/pkg/config/log.go
rename to services/audit/pkg/config/log.go
diff --git a/extensions/audit/pkg/config/parser/parse.go b/services/audit/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/audit/pkg/config/parser/parse.go
rename to services/audit/pkg/config/parser/parse.go
diff --git a/extensions/audit/pkg/config/service.go b/services/audit/pkg/config/service.go
similarity index 100%
rename from extensions/audit/pkg/config/service.go
rename to services/audit/pkg/config/service.go
diff --git a/extensions/audit/pkg/logging/logging.go b/services/audit/pkg/logging/logging.go
similarity index 100%
rename from extensions/audit/pkg/logging/logging.go
rename to services/audit/pkg/logging/logging.go
diff --git a/extensions/audit/pkg/service/service.go b/services/audit/pkg/service/service.go
similarity index 100%
rename from extensions/audit/pkg/service/service.go
rename to services/audit/pkg/service/service.go
diff --git a/extensions/audit/pkg/service/service_test.go b/services/audit/pkg/service/service_test.go
similarity index 100%
rename from extensions/audit/pkg/service/service_test.go
rename to services/audit/pkg/service/service_test.go
diff --git a/extensions/audit/pkg/types/constants.go b/services/audit/pkg/types/constants.go
similarity index 100%
rename from extensions/audit/pkg/types/constants.go
rename to services/audit/pkg/types/constants.go
diff --git a/extensions/audit/pkg/types/conversion.go b/services/audit/pkg/types/conversion.go
similarity index 100%
rename from extensions/audit/pkg/types/conversion.go
rename to services/audit/pkg/types/conversion.go
diff --git a/extensions/audit/pkg/types/events.go b/services/audit/pkg/types/events.go
similarity index 100%
rename from extensions/audit/pkg/types/events.go
rename to services/audit/pkg/types/events.go
diff --git a/extensions/audit/pkg/types/types.go b/services/audit/pkg/types/types.go
similarity index 100%
rename from extensions/audit/pkg/types/types.go
rename to services/audit/pkg/types/types.go
diff --git a/extensions/auth-basic/Makefile b/services/auth-basic/Makefile
similarity index 100%
rename from extensions/auth-basic/Makefile
rename to services/auth-basic/Makefile
diff --git a/extensions/auth-basic/cmd/auth-basic/main.go b/services/auth-basic/cmd/auth-basic/main.go
similarity index 100%
rename from extensions/auth-basic/cmd/auth-basic/main.go
rename to services/auth-basic/cmd/auth-basic/main.go
diff --git a/extensions/auth-basic/pkg/command/health.go b/services/auth-basic/pkg/command/health.go
similarity index 100%
rename from extensions/auth-basic/pkg/command/health.go
rename to services/auth-basic/pkg/command/health.go
diff --git a/extensions/auth-basic/pkg/command/root.go b/services/auth-basic/pkg/command/root.go
similarity index 100%
rename from extensions/auth-basic/pkg/command/root.go
rename to services/auth-basic/pkg/command/root.go
diff --git a/extensions/auth-basic/pkg/command/server.go b/services/auth-basic/pkg/command/server.go
similarity index 100%
rename from extensions/auth-basic/pkg/command/server.go
rename to services/auth-basic/pkg/command/server.go
diff --git a/extensions/auth-basic/pkg/command/version.go b/services/auth-basic/pkg/command/version.go
similarity index 100%
rename from extensions/auth-basic/pkg/command/version.go
rename to services/auth-basic/pkg/command/version.go
diff --git a/extensions/auth-basic/pkg/config/config.go b/services/auth-basic/pkg/config/config.go
similarity index 100%
rename from extensions/auth-basic/pkg/config/config.go
rename to services/auth-basic/pkg/config/config.go
diff --git a/extensions/auth-basic/pkg/config/defaults/defaultconfig.go b/services/auth-basic/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/auth-basic/pkg/config/defaults/defaultconfig.go
rename to services/auth-basic/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/auth-basic/pkg/config/parser/parse.go b/services/auth-basic/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/auth-basic/pkg/config/parser/parse.go
rename to services/auth-basic/pkg/config/parser/parse.go
diff --git a/extensions/auth-basic/pkg/config/reva.go b/services/auth-basic/pkg/config/reva.go
similarity index 100%
rename from extensions/auth-basic/pkg/config/reva.go
rename to services/auth-basic/pkg/config/reva.go
diff --git a/extensions/auth-basic/pkg/logging/logging.go b/services/auth-basic/pkg/logging/logging.go
similarity index 100%
rename from extensions/auth-basic/pkg/logging/logging.go
rename to services/auth-basic/pkg/logging/logging.go
diff --git a/extensions/auth-basic/pkg/revaconfig/config.go b/services/auth-basic/pkg/revaconfig/config.go
similarity index 100%
rename from extensions/auth-basic/pkg/revaconfig/config.go
rename to services/auth-basic/pkg/revaconfig/config.go
diff --git a/extensions/auth-basic/pkg/server/debug/option.go b/services/auth-basic/pkg/server/debug/option.go
similarity index 100%
rename from extensions/auth-basic/pkg/server/debug/option.go
rename to services/auth-basic/pkg/server/debug/option.go
diff --git a/extensions/auth-basic/pkg/server/debug/server.go b/services/auth-basic/pkg/server/debug/server.go
similarity index 100%
rename from extensions/auth-basic/pkg/server/debug/server.go
rename to services/auth-basic/pkg/server/debug/server.go
diff --git a/extensions/auth-basic/pkg/tracing/tracing.go b/services/auth-basic/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/auth-basic/pkg/tracing/tracing.go
rename to services/auth-basic/pkg/tracing/tracing.go
diff --git a/extensions/auth-bearer/Makefile b/services/auth-bearer/Makefile
similarity index 100%
rename from extensions/auth-bearer/Makefile
rename to services/auth-bearer/Makefile
diff --git a/extensions/auth-bearer/cmd/auth-bearer/main.go b/services/auth-bearer/cmd/auth-bearer/main.go
similarity index 100%
rename from extensions/auth-bearer/cmd/auth-bearer/main.go
rename to services/auth-bearer/cmd/auth-bearer/main.go
diff --git a/extensions/auth-bearer/pkg/command/health.go b/services/auth-bearer/pkg/command/health.go
similarity index 100%
rename from extensions/auth-bearer/pkg/command/health.go
rename to services/auth-bearer/pkg/command/health.go
diff --git a/extensions/auth-bearer/pkg/command/root.go b/services/auth-bearer/pkg/command/root.go
similarity index 100%
rename from extensions/auth-bearer/pkg/command/root.go
rename to services/auth-bearer/pkg/command/root.go
diff --git a/extensions/auth-bearer/pkg/command/server.go b/services/auth-bearer/pkg/command/server.go
similarity index 100%
rename from extensions/auth-bearer/pkg/command/server.go
rename to services/auth-bearer/pkg/command/server.go
diff --git a/extensions/auth-bearer/pkg/command/version.go b/services/auth-bearer/pkg/command/version.go
similarity index 100%
rename from extensions/auth-bearer/pkg/command/version.go
rename to services/auth-bearer/pkg/command/version.go
diff --git a/extensions/auth-bearer/pkg/config/config.go b/services/auth-bearer/pkg/config/config.go
similarity index 100%
rename from extensions/auth-bearer/pkg/config/config.go
rename to services/auth-bearer/pkg/config/config.go
diff --git a/extensions/auth-bearer/pkg/config/defaults/defaultconfig.go b/services/auth-bearer/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/auth-bearer/pkg/config/defaults/defaultconfig.go
rename to services/auth-bearer/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/auth-bearer/pkg/config/parser/parse.go b/services/auth-bearer/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/auth-bearer/pkg/config/parser/parse.go
rename to services/auth-bearer/pkg/config/parser/parse.go
diff --git a/extensions/auth-bearer/pkg/config/reva.go b/services/auth-bearer/pkg/config/reva.go
similarity index 100%
rename from extensions/auth-bearer/pkg/config/reva.go
rename to services/auth-bearer/pkg/config/reva.go
diff --git a/extensions/auth-bearer/pkg/logging/logging.go b/services/auth-bearer/pkg/logging/logging.go
similarity index 100%
rename from extensions/auth-bearer/pkg/logging/logging.go
rename to services/auth-bearer/pkg/logging/logging.go
diff --git a/extensions/auth-bearer/pkg/revaconfig/config.go b/services/auth-bearer/pkg/revaconfig/config.go
similarity index 100%
rename from extensions/auth-bearer/pkg/revaconfig/config.go
rename to services/auth-bearer/pkg/revaconfig/config.go
diff --git a/extensions/auth-bearer/pkg/server/debug/option.go b/services/auth-bearer/pkg/server/debug/option.go
similarity index 100%
rename from extensions/auth-bearer/pkg/server/debug/option.go
rename to services/auth-bearer/pkg/server/debug/option.go
diff --git a/extensions/auth-bearer/pkg/server/debug/server.go b/services/auth-bearer/pkg/server/debug/server.go
similarity index 100%
rename from extensions/auth-bearer/pkg/server/debug/server.go
rename to services/auth-bearer/pkg/server/debug/server.go
diff --git a/extensions/auth-bearer/pkg/tracing/tracing.go b/services/auth-bearer/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/auth-bearer/pkg/tracing/tracing.go
rename to services/auth-bearer/pkg/tracing/tracing.go
diff --git a/extensions/auth-machine/Makefile b/services/auth-machine/Makefile
similarity index 100%
rename from extensions/auth-machine/Makefile
rename to services/auth-machine/Makefile
diff --git a/extensions/auth-machine/cmd/auth-machine/main.go b/services/auth-machine/cmd/auth-machine/main.go
similarity index 100%
rename from extensions/auth-machine/cmd/auth-machine/main.go
rename to services/auth-machine/cmd/auth-machine/main.go
diff --git a/extensions/auth-machine/pkg/command/health.go b/services/auth-machine/pkg/command/health.go
similarity index 100%
rename from extensions/auth-machine/pkg/command/health.go
rename to services/auth-machine/pkg/command/health.go
diff --git a/extensions/auth-machine/pkg/command/root.go b/services/auth-machine/pkg/command/root.go
similarity index 100%
rename from extensions/auth-machine/pkg/command/root.go
rename to services/auth-machine/pkg/command/root.go
diff --git a/extensions/auth-machine/pkg/command/server.go b/services/auth-machine/pkg/command/server.go
similarity index 100%
rename from extensions/auth-machine/pkg/command/server.go
rename to services/auth-machine/pkg/command/server.go
diff --git a/extensions/auth-machine/pkg/command/version.go b/services/auth-machine/pkg/command/version.go
similarity index 100%
rename from extensions/auth-machine/pkg/command/version.go
rename to services/auth-machine/pkg/command/version.go
diff --git a/extensions/auth-machine/pkg/config/config.go b/services/auth-machine/pkg/config/config.go
similarity index 100%
rename from extensions/auth-machine/pkg/config/config.go
rename to services/auth-machine/pkg/config/config.go
diff --git a/extensions/auth-machine/pkg/config/defaults/defaultconfig.go b/services/auth-machine/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/auth-machine/pkg/config/defaults/defaultconfig.go
rename to services/auth-machine/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/auth-machine/pkg/config/parser/parse.go b/services/auth-machine/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/auth-machine/pkg/config/parser/parse.go
rename to services/auth-machine/pkg/config/parser/parse.go
diff --git a/extensions/auth-machine/pkg/config/reva.go b/services/auth-machine/pkg/config/reva.go
similarity index 100%
rename from extensions/auth-machine/pkg/config/reva.go
rename to services/auth-machine/pkg/config/reva.go
diff --git a/extensions/auth-machine/pkg/logging/logging.go b/services/auth-machine/pkg/logging/logging.go
similarity index 100%
rename from extensions/auth-machine/pkg/logging/logging.go
rename to services/auth-machine/pkg/logging/logging.go
diff --git a/extensions/auth-machine/pkg/revaconfig/config.go b/services/auth-machine/pkg/revaconfig/config.go
similarity index 100%
rename from extensions/auth-machine/pkg/revaconfig/config.go
rename to services/auth-machine/pkg/revaconfig/config.go
diff --git a/extensions/auth-machine/pkg/server/debug/option.go b/services/auth-machine/pkg/server/debug/option.go
similarity index 100%
rename from extensions/auth-machine/pkg/server/debug/option.go
rename to services/auth-machine/pkg/server/debug/option.go
diff --git a/extensions/auth-machine/pkg/server/debug/server.go b/services/auth-machine/pkg/server/debug/server.go
similarity index 100%
rename from extensions/auth-machine/pkg/server/debug/server.go
rename to services/auth-machine/pkg/server/debug/server.go
diff --git a/extensions/auth-machine/pkg/tracing/tracing.go b/services/auth-machine/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/auth-machine/pkg/tracing/tracing.go
rename to services/auth-machine/pkg/tracing/tracing.go
diff --git a/extensions/frontend/Makefile b/services/frontend/Makefile
similarity index 100%
rename from extensions/frontend/Makefile
rename to services/frontend/Makefile
diff --git a/extensions/frontend/cmd/frontend/main.go b/services/frontend/cmd/frontend/main.go
similarity index 100%
rename from extensions/frontend/cmd/frontend/main.go
rename to services/frontend/cmd/frontend/main.go
diff --git a/extensions/frontend/pkg/command/health.go b/services/frontend/pkg/command/health.go
similarity index 100%
rename from extensions/frontend/pkg/command/health.go
rename to services/frontend/pkg/command/health.go
diff --git a/extensions/frontend/pkg/command/root.go b/services/frontend/pkg/command/root.go
similarity index 100%
rename from extensions/frontend/pkg/command/root.go
rename to services/frontend/pkg/command/root.go
diff --git a/extensions/frontend/pkg/command/server.go b/services/frontend/pkg/command/server.go
similarity index 100%
rename from extensions/frontend/pkg/command/server.go
rename to services/frontend/pkg/command/server.go
diff --git a/extensions/frontend/pkg/command/version.go b/services/frontend/pkg/command/version.go
similarity index 100%
rename from extensions/frontend/pkg/command/version.go
rename to services/frontend/pkg/command/version.go
diff --git a/extensions/frontend/pkg/config/config.go b/services/frontend/pkg/config/config.go
similarity index 100%
rename from extensions/frontend/pkg/config/config.go
rename to services/frontend/pkg/config/config.go
diff --git a/extensions/frontend/pkg/config/defaults/defaultconfig.go b/services/frontend/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/frontend/pkg/config/defaults/defaultconfig.go
rename to services/frontend/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/frontend/pkg/config/parser/parse.go b/services/frontend/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/frontend/pkg/config/parser/parse.go
rename to services/frontend/pkg/config/parser/parse.go
diff --git a/extensions/frontend/pkg/config/reva.go b/services/frontend/pkg/config/reva.go
similarity index 100%
rename from extensions/frontend/pkg/config/reva.go
rename to services/frontend/pkg/config/reva.go
diff --git a/extensions/frontend/pkg/logging/logging.go b/services/frontend/pkg/logging/logging.go
similarity index 100%
rename from extensions/frontend/pkg/logging/logging.go
rename to services/frontend/pkg/logging/logging.go
diff --git a/extensions/frontend/pkg/revaconfig/config.go b/services/frontend/pkg/revaconfig/config.go
similarity index 100%
rename from extensions/frontend/pkg/revaconfig/config.go
rename to services/frontend/pkg/revaconfig/config.go
diff --git a/extensions/frontend/pkg/server/debug/option.go b/services/frontend/pkg/server/debug/option.go
similarity index 100%
rename from extensions/frontend/pkg/server/debug/option.go
rename to services/frontend/pkg/server/debug/option.go
diff --git a/extensions/frontend/pkg/server/debug/server.go b/services/frontend/pkg/server/debug/server.go
similarity index 100%
rename from extensions/frontend/pkg/server/debug/server.go
rename to services/frontend/pkg/server/debug/server.go
diff --git a/extensions/frontend/pkg/tracing/tracing.go b/services/frontend/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/frontend/pkg/tracing/tracing.go
rename to services/frontend/pkg/tracing/tracing.go
diff --git a/extensions/gateway/Makefile b/services/gateway/Makefile
similarity index 100%
rename from extensions/gateway/Makefile
rename to services/gateway/Makefile
diff --git a/extensions/gateway/cmd/gateway/main.go b/services/gateway/cmd/gateway/main.go
similarity index 100%
rename from extensions/gateway/cmd/gateway/main.go
rename to services/gateway/cmd/gateway/main.go
diff --git a/extensions/gateway/pkg/command/health.go b/services/gateway/pkg/command/health.go
similarity index 100%
rename from extensions/gateway/pkg/command/health.go
rename to services/gateway/pkg/command/health.go
diff --git a/extensions/gateway/pkg/command/root.go b/services/gateway/pkg/command/root.go
similarity index 100%
rename from extensions/gateway/pkg/command/root.go
rename to services/gateway/pkg/command/root.go
diff --git a/extensions/gateway/pkg/command/server.go b/services/gateway/pkg/command/server.go
similarity index 100%
rename from extensions/gateway/pkg/command/server.go
rename to services/gateway/pkg/command/server.go
diff --git a/extensions/gateway/pkg/command/version.go b/services/gateway/pkg/command/version.go
similarity index 100%
rename from extensions/gateway/pkg/command/version.go
rename to services/gateway/pkg/command/version.go
diff --git a/extensions/gateway/pkg/config/config.go b/services/gateway/pkg/config/config.go
similarity index 100%
rename from extensions/gateway/pkg/config/config.go
rename to services/gateway/pkg/config/config.go
diff --git a/extensions/gateway/pkg/config/defaults/defaultconfig.go b/services/gateway/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/gateway/pkg/config/defaults/defaultconfig.go
rename to services/gateway/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/gateway/pkg/config/parser/parse.go b/services/gateway/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/gateway/pkg/config/parser/parse.go
rename to services/gateway/pkg/config/parser/parse.go
diff --git a/extensions/gateway/pkg/config/reva.go b/services/gateway/pkg/config/reva.go
similarity index 100%
rename from extensions/gateway/pkg/config/reva.go
rename to services/gateway/pkg/config/reva.go
diff --git a/extensions/gateway/pkg/logging/logging.go b/services/gateway/pkg/logging/logging.go
similarity index 100%
rename from extensions/gateway/pkg/logging/logging.go
rename to services/gateway/pkg/logging/logging.go
diff --git a/extensions/gateway/pkg/revaconfig/config.go b/services/gateway/pkg/revaconfig/config.go
similarity index 100%
rename from extensions/gateway/pkg/revaconfig/config.go
rename to services/gateway/pkg/revaconfig/config.go
diff --git a/extensions/gateway/pkg/server/debug/option.go b/services/gateway/pkg/server/debug/option.go
similarity index 100%
rename from extensions/gateway/pkg/server/debug/option.go
rename to services/gateway/pkg/server/debug/option.go
diff --git a/extensions/gateway/pkg/server/debug/server.go b/services/gateway/pkg/server/debug/server.go
similarity index 100%
rename from extensions/gateway/pkg/server/debug/server.go
rename to services/gateway/pkg/server/debug/server.go
diff --git a/extensions/gateway/pkg/tracing/tracing.go b/services/gateway/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/gateway/pkg/tracing/tracing.go
rename to services/gateway/pkg/tracing/tracing.go
diff --git a/extensions/graph-explorer/.dockerignore b/services/graph-explorer/.dockerignore
similarity index 100%
rename from extensions/graph-explorer/.dockerignore
rename to services/graph-explorer/.dockerignore
diff --git a/extensions/graph-explorer/Makefile b/services/graph-explorer/Makefile
similarity index 100%
rename from extensions/graph-explorer/Makefile
rename to services/graph-explorer/Makefile
diff --git a/extensions/graph-explorer/assets/.keep b/services/graph-explorer/assets/.keep
similarity index 100%
rename from extensions/graph-explorer/assets/.keep
rename to services/graph-explorer/assets/.keep
diff --git a/extensions/graph-explorer/cmd/graph-explorer/main.go b/services/graph-explorer/cmd/graph-explorer/main.go
similarity index 100%
rename from extensions/graph-explorer/cmd/graph-explorer/main.go
rename to services/graph-explorer/cmd/graph-explorer/main.go
diff --git a/extensions/graph-explorer/docker/Dockerfile.linux.amd64 b/services/graph-explorer/docker/Dockerfile.linux.amd64
similarity index 100%
rename from extensions/graph-explorer/docker/Dockerfile.linux.amd64
rename to services/graph-explorer/docker/Dockerfile.linux.amd64
diff --git a/extensions/graph-explorer/docker/Dockerfile.linux.arm b/services/graph-explorer/docker/Dockerfile.linux.arm
similarity index 100%
rename from extensions/graph-explorer/docker/Dockerfile.linux.arm
rename to services/graph-explorer/docker/Dockerfile.linux.arm
diff --git a/extensions/graph-explorer/docker/Dockerfile.linux.arm64 b/services/graph-explorer/docker/Dockerfile.linux.arm64
similarity index 100%
rename from extensions/graph-explorer/docker/Dockerfile.linux.arm64
rename to services/graph-explorer/docker/Dockerfile.linux.arm64
diff --git a/extensions/graph-explorer/docker/manifest.tmpl b/services/graph-explorer/docker/manifest.tmpl
similarity index 100%
rename from extensions/graph-explorer/docker/manifest.tmpl
rename to services/graph-explorer/docker/manifest.tmpl
diff --git a/extensions/graph-explorer/graph_explorer.go b/services/graph-explorer/graph_explorer.go
similarity index 100%
rename from extensions/graph-explorer/graph_explorer.go
rename to services/graph-explorer/graph_explorer.go
diff --git a/extensions/graph-explorer/pkg/assets/option.go b/services/graph-explorer/pkg/assets/option.go
similarity index 100%
rename from extensions/graph-explorer/pkg/assets/option.go
rename to services/graph-explorer/pkg/assets/option.go
diff --git a/extensions/graph-explorer/pkg/command/health.go b/services/graph-explorer/pkg/command/health.go
similarity index 100%
rename from extensions/graph-explorer/pkg/command/health.go
rename to services/graph-explorer/pkg/command/health.go
diff --git a/extensions/graph-explorer/pkg/command/root.go b/services/graph-explorer/pkg/command/root.go
similarity index 100%
rename from extensions/graph-explorer/pkg/command/root.go
rename to services/graph-explorer/pkg/command/root.go
diff --git a/extensions/graph-explorer/pkg/command/server.go b/services/graph-explorer/pkg/command/server.go
similarity index 100%
rename from extensions/graph-explorer/pkg/command/server.go
rename to services/graph-explorer/pkg/command/server.go
diff --git a/extensions/graph-explorer/pkg/command/version.go b/services/graph-explorer/pkg/command/version.go
similarity index 100%
rename from extensions/graph-explorer/pkg/command/version.go
rename to services/graph-explorer/pkg/command/version.go
diff --git a/extensions/graph-explorer/pkg/config/config.go b/services/graph-explorer/pkg/config/config.go
similarity index 100%
rename from extensions/graph-explorer/pkg/config/config.go
rename to services/graph-explorer/pkg/config/config.go
diff --git a/extensions/graph-explorer/pkg/config/debug.go b/services/graph-explorer/pkg/config/debug.go
similarity index 100%
rename from extensions/graph-explorer/pkg/config/debug.go
rename to services/graph-explorer/pkg/config/debug.go
diff --git a/extensions/graph-explorer/pkg/config/defaults/defaultconfig.go b/services/graph-explorer/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/graph-explorer/pkg/config/defaults/defaultconfig.go
rename to services/graph-explorer/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/graph-explorer/pkg/config/http.go b/services/graph-explorer/pkg/config/http.go
similarity index 100%
rename from extensions/graph-explorer/pkg/config/http.go
rename to services/graph-explorer/pkg/config/http.go
diff --git a/extensions/graph-explorer/pkg/config/log.go b/services/graph-explorer/pkg/config/log.go
similarity index 100%
rename from extensions/graph-explorer/pkg/config/log.go
rename to services/graph-explorer/pkg/config/log.go
diff --git a/extensions/graph-explorer/pkg/config/parser/parse.go b/services/graph-explorer/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/graph-explorer/pkg/config/parser/parse.go
rename to services/graph-explorer/pkg/config/parser/parse.go
diff --git a/extensions/graph-explorer/pkg/config/service.go b/services/graph-explorer/pkg/config/service.go
similarity index 100%
rename from extensions/graph-explorer/pkg/config/service.go
rename to services/graph-explorer/pkg/config/service.go
diff --git a/extensions/graph-explorer/pkg/config/tracing.go b/services/graph-explorer/pkg/config/tracing.go
similarity index 100%
rename from extensions/graph-explorer/pkg/config/tracing.go
rename to services/graph-explorer/pkg/config/tracing.go
diff --git a/extensions/graph-explorer/pkg/logging/logging.go b/services/graph-explorer/pkg/logging/logging.go
similarity index 100%
rename from extensions/graph-explorer/pkg/logging/logging.go
rename to services/graph-explorer/pkg/logging/logging.go
diff --git a/extensions/graph-explorer/pkg/metrics/metrics.go b/services/graph-explorer/pkg/metrics/metrics.go
similarity index 100%
rename from extensions/graph-explorer/pkg/metrics/metrics.go
rename to services/graph-explorer/pkg/metrics/metrics.go
diff --git a/extensions/graph-explorer/pkg/server/debug/option.go b/services/graph-explorer/pkg/server/debug/option.go
similarity index 100%
rename from extensions/graph-explorer/pkg/server/debug/option.go
rename to services/graph-explorer/pkg/server/debug/option.go
diff --git a/extensions/graph-explorer/pkg/server/debug/server.go b/services/graph-explorer/pkg/server/debug/server.go
similarity index 100%
rename from extensions/graph-explorer/pkg/server/debug/server.go
rename to services/graph-explorer/pkg/server/debug/server.go
diff --git a/extensions/graph-explorer/pkg/server/http/option.go b/services/graph-explorer/pkg/server/http/option.go
similarity index 100%
rename from extensions/graph-explorer/pkg/server/http/option.go
rename to services/graph-explorer/pkg/server/http/option.go
diff --git a/extensions/graph-explorer/pkg/server/http/server.go b/services/graph-explorer/pkg/server/http/server.go
similarity index 100%
rename from extensions/graph-explorer/pkg/server/http/server.go
rename to services/graph-explorer/pkg/server/http/server.go
diff --git a/extensions/graph-explorer/pkg/service/v0/instrument.go b/services/graph-explorer/pkg/service/v0/instrument.go
similarity index 100%
rename from extensions/graph-explorer/pkg/service/v0/instrument.go
rename to services/graph-explorer/pkg/service/v0/instrument.go
diff --git a/extensions/graph-explorer/pkg/service/v0/logging.go b/services/graph-explorer/pkg/service/v0/logging.go
similarity index 100%
rename from extensions/graph-explorer/pkg/service/v0/logging.go
rename to services/graph-explorer/pkg/service/v0/logging.go
diff --git a/extensions/graph-explorer/pkg/service/v0/option.go b/services/graph-explorer/pkg/service/v0/option.go
similarity index 100%
rename from extensions/graph-explorer/pkg/service/v0/option.go
rename to services/graph-explorer/pkg/service/v0/option.go
diff --git a/extensions/graph-explorer/pkg/service/v0/service.go b/services/graph-explorer/pkg/service/v0/service.go
similarity index 100%
rename from extensions/graph-explorer/pkg/service/v0/service.go
rename to services/graph-explorer/pkg/service/v0/service.go
diff --git a/extensions/graph-explorer/pkg/service/v0/tracing.go b/services/graph-explorer/pkg/service/v0/tracing.go
similarity index 100%
rename from extensions/graph-explorer/pkg/service/v0/tracing.go
rename to services/graph-explorer/pkg/service/v0/tracing.go
diff --git a/extensions/graph-explorer/pkg/tracing/tracing.go b/services/graph-explorer/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/graph-explorer/pkg/tracing/tracing.go
rename to services/graph-explorer/pkg/tracing/tracing.go
diff --git a/extensions/graph-explorer/reflex.conf b/services/graph-explorer/reflex.conf
similarity index 100%
rename from extensions/graph-explorer/reflex.conf
rename to services/graph-explorer/reflex.conf
diff --git a/extensions/graph/.dockerignore b/services/graph/.dockerignore
similarity index 100%
rename from extensions/graph/.dockerignore
rename to services/graph/.dockerignore
diff --git a/extensions/graph/Makefile b/services/graph/Makefile
similarity index 100%
rename from extensions/graph/Makefile
rename to services/graph/Makefile
diff --git a/extensions/graph/cmd/graph/main.go b/services/graph/cmd/graph/main.go
similarity index 100%
rename from extensions/graph/cmd/graph/main.go
rename to services/graph/cmd/graph/main.go
diff --git a/extensions/graph/docker/Dockerfile.linux.amd64 b/services/graph/docker/Dockerfile.linux.amd64
similarity index 100%
rename from extensions/graph/docker/Dockerfile.linux.amd64
rename to services/graph/docker/Dockerfile.linux.amd64
diff --git a/extensions/graph/docker/Dockerfile.linux.arm b/services/graph/docker/Dockerfile.linux.arm
similarity index 100%
rename from extensions/graph/docker/Dockerfile.linux.arm
rename to services/graph/docker/Dockerfile.linux.arm
diff --git a/extensions/graph/docker/Dockerfile.linux.arm64 b/services/graph/docker/Dockerfile.linux.arm64
similarity index 100%
rename from extensions/graph/docker/Dockerfile.linux.arm64
rename to services/graph/docker/Dockerfile.linux.arm64
diff --git a/extensions/graph/docker/manifest.tmpl b/services/graph/docker/manifest.tmpl
similarity index 100%
rename from extensions/graph/docker/manifest.tmpl
rename to services/graph/docker/manifest.tmpl
diff --git a/extensions/graph/mocks/gateway_client.go b/services/graph/mocks/gateway_client.go
similarity index 100%
rename from extensions/graph/mocks/gateway_client.go
rename to services/graph/mocks/gateway_client.go
diff --git a/extensions/graph/mocks/http_client.go b/services/graph/mocks/http_client.go
similarity index 100%
rename from extensions/graph/mocks/http_client.go
rename to services/graph/mocks/http_client.go
diff --git a/extensions/graph/mocks/ldapclient.go b/services/graph/mocks/ldapclient.go
similarity index 100%
rename from extensions/graph/mocks/ldapclient.go
rename to services/graph/mocks/ldapclient.go
diff --git a/extensions/graph/mocks/publisher.go b/services/graph/mocks/publisher.go
similarity index 100%
rename from extensions/graph/mocks/publisher.go
rename to services/graph/mocks/publisher.go
diff --git a/extensions/graph/pkg/command/health.go b/services/graph/pkg/command/health.go
similarity index 100%
rename from extensions/graph/pkg/command/health.go
rename to services/graph/pkg/command/health.go
diff --git a/extensions/graph/pkg/command/root.go b/services/graph/pkg/command/root.go
similarity index 100%
rename from extensions/graph/pkg/command/root.go
rename to services/graph/pkg/command/root.go
diff --git a/extensions/graph/pkg/command/server.go b/services/graph/pkg/command/server.go
similarity index 100%
rename from extensions/graph/pkg/command/server.go
rename to services/graph/pkg/command/server.go
diff --git a/extensions/graph/pkg/command/version.go b/services/graph/pkg/command/version.go
similarity index 100%
rename from extensions/graph/pkg/command/version.go
rename to services/graph/pkg/command/version.go
diff --git a/extensions/graph/pkg/config/config.go b/services/graph/pkg/config/config.go
similarity index 100%
rename from extensions/graph/pkg/config/config.go
rename to services/graph/pkg/config/config.go
diff --git a/extensions/graph/pkg/config/debug.go b/services/graph/pkg/config/debug.go
similarity index 100%
rename from extensions/graph/pkg/config/debug.go
rename to services/graph/pkg/config/debug.go
diff --git a/extensions/graph/pkg/config/defaults/defaultconfig.go b/services/graph/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/graph/pkg/config/defaults/defaultconfig.go
rename to services/graph/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/graph/pkg/config/http.go b/services/graph/pkg/config/http.go
similarity index 100%
rename from extensions/graph/pkg/config/http.go
rename to services/graph/pkg/config/http.go
diff --git a/extensions/graph/pkg/config/log.go b/services/graph/pkg/config/log.go
similarity index 100%
rename from extensions/graph/pkg/config/log.go
rename to services/graph/pkg/config/log.go
diff --git a/extensions/graph/pkg/config/parser/parse.go b/services/graph/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/graph/pkg/config/parser/parse.go
rename to services/graph/pkg/config/parser/parse.go
diff --git a/extensions/graph/pkg/config/reva.go b/services/graph/pkg/config/reva.go
similarity index 100%
rename from extensions/graph/pkg/config/reva.go
rename to services/graph/pkg/config/reva.go
diff --git a/extensions/graph/pkg/config/service.go b/services/graph/pkg/config/service.go
similarity index 100%
rename from extensions/graph/pkg/config/service.go
rename to services/graph/pkg/config/service.go
diff --git a/extensions/graph/pkg/config/tracing.go b/services/graph/pkg/config/tracing.go
similarity index 100%
rename from extensions/graph/pkg/config/tracing.go
rename to services/graph/pkg/config/tracing.go
diff --git a/extensions/graph/pkg/identity/backend.go b/services/graph/pkg/identity/backend.go
similarity index 100%
rename from extensions/graph/pkg/identity/backend.go
rename to services/graph/pkg/identity/backend.go
diff --git a/extensions/graph/pkg/identity/cs3.go b/services/graph/pkg/identity/cs3.go
similarity index 100%
rename from extensions/graph/pkg/identity/cs3.go
rename to services/graph/pkg/identity/cs3.go
diff --git a/extensions/graph/pkg/identity/ldap.go b/services/graph/pkg/identity/ldap.go
similarity index 100%
rename from extensions/graph/pkg/identity/ldap.go
rename to services/graph/pkg/identity/ldap.go
diff --git a/extensions/graph/pkg/identity/ldap/reconnect.go b/services/graph/pkg/identity/ldap/reconnect.go
similarity index 100%
rename from extensions/graph/pkg/identity/ldap/reconnect.go
rename to services/graph/pkg/identity/ldap/reconnect.go
diff --git a/extensions/graph/pkg/identity/ldap_test.go b/services/graph/pkg/identity/ldap_test.go
similarity index 100%
rename from extensions/graph/pkg/identity/ldap_test.go
rename to services/graph/pkg/identity/ldap_test.go
diff --git a/extensions/graph/pkg/logging/logging.go b/services/graph/pkg/logging/logging.go
similarity index 100%
rename from extensions/graph/pkg/logging/logging.go
rename to services/graph/pkg/logging/logging.go
diff --git a/extensions/graph/pkg/metrics/metrics.go b/services/graph/pkg/metrics/metrics.go
similarity index 100%
rename from extensions/graph/pkg/metrics/metrics.go
rename to services/graph/pkg/metrics/metrics.go
diff --git a/extensions/graph/pkg/middleware/auth.go b/services/graph/pkg/middleware/auth.go
similarity index 100%
rename from extensions/graph/pkg/middleware/auth.go
rename to services/graph/pkg/middleware/auth.go
diff --git a/extensions/graph/pkg/middleware/requireadmin.go b/services/graph/pkg/middleware/requireadmin.go
similarity index 100%
rename from extensions/graph/pkg/middleware/requireadmin.go
rename to services/graph/pkg/middleware/requireadmin.go
diff --git a/extensions/graph/pkg/server/debug/option.go b/services/graph/pkg/server/debug/option.go
similarity index 100%
rename from extensions/graph/pkg/server/debug/option.go
rename to services/graph/pkg/server/debug/option.go
diff --git a/extensions/graph/pkg/server/debug/server.go b/services/graph/pkg/server/debug/server.go
similarity index 100%
rename from extensions/graph/pkg/server/debug/server.go
rename to services/graph/pkg/server/debug/server.go
diff --git a/extensions/graph/pkg/server/http/option.go b/services/graph/pkg/server/http/option.go
similarity index 100%
rename from extensions/graph/pkg/server/http/option.go
rename to services/graph/pkg/server/http/option.go
diff --git a/extensions/graph/pkg/server/http/server.go b/services/graph/pkg/server/http/server.go
similarity index 100%
rename from extensions/graph/pkg/server/http/server.go
rename to services/graph/pkg/server/http/server.go
diff --git a/extensions/graph/pkg/service/v0/driveitems.go b/services/graph/pkg/service/v0/driveitems.go
similarity index 100%
rename from extensions/graph/pkg/service/v0/driveitems.go
rename to services/graph/pkg/service/v0/driveitems.go
diff --git a/extensions/graph/pkg/service/v0/drives.go b/services/graph/pkg/service/v0/drives.go
similarity index 100%
rename from extensions/graph/pkg/service/v0/drives.go
rename to services/graph/pkg/service/v0/drives.go
diff --git a/extensions/graph/pkg/service/v0/drives_test.go b/services/graph/pkg/service/v0/drives_test.go
similarity index 100%
rename from extensions/graph/pkg/service/v0/drives_test.go
rename to services/graph/pkg/service/v0/drives_test.go
diff --git a/extensions/graph/pkg/service/v0/errorcode/errorcode.go b/services/graph/pkg/service/v0/errorcode/errorcode.go
similarity index 100%
rename from extensions/graph/pkg/service/v0/errorcode/errorcode.go
rename to services/graph/pkg/service/v0/errorcode/errorcode.go
diff --git a/extensions/graph/pkg/service/v0/graph.go b/services/graph/pkg/service/v0/graph.go
similarity index 100%
rename from extensions/graph/pkg/service/v0/graph.go
rename to services/graph/pkg/service/v0/graph.go
diff --git a/extensions/graph/pkg/service/v0/graph_suite_test.go b/services/graph/pkg/service/v0/graph_suite_test.go
similarity index 100%
rename from extensions/graph/pkg/service/v0/graph_suite_test.go
rename to services/graph/pkg/service/v0/graph_suite_test.go
diff --git a/extensions/graph/pkg/service/v0/graph_test.go b/services/graph/pkg/service/v0/graph_test.go
similarity index 100%
rename from extensions/graph/pkg/service/v0/graph_test.go
rename to services/graph/pkg/service/v0/graph_test.go
diff --git a/extensions/graph/pkg/service/v0/groups.go b/services/graph/pkg/service/v0/groups.go
similarity index 100%
rename from extensions/graph/pkg/service/v0/groups.go
rename to services/graph/pkg/service/v0/groups.go
diff --git a/extensions/graph/pkg/service/v0/instrument.go b/services/graph/pkg/service/v0/instrument.go
similarity index 100%
rename from extensions/graph/pkg/service/v0/instrument.go
rename to services/graph/pkg/service/v0/instrument.go
diff --git a/extensions/graph/pkg/service/v0/logging.go b/services/graph/pkg/service/v0/logging.go
similarity index 100%
rename from extensions/graph/pkg/service/v0/logging.go
rename to services/graph/pkg/service/v0/logging.go
diff --git a/extensions/graph/pkg/service/v0/net/headers.go b/services/graph/pkg/service/v0/net/headers.go
similarity index 100%
rename from extensions/graph/pkg/service/v0/net/headers.go
rename to services/graph/pkg/service/v0/net/headers.go
diff --git a/extensions/graph/pkg/service/v0/option.go b/services/graph/pkg/service/v0/option.go
similarity index 100%
rename from extensions/graph/pkg/service/v0/option.go
rename to services/graph/pkg/service/v0/option.go
diff --git a/extensions/graph/pkg/service/v0/ordering.go b/services/graph/pkg/service/v0/ordering.go
similarity index 100%
rename from extensions/graph/pkg/service/v0/ordering.go
rename to services/graph/pkg/service/v0/ordering.go
diff --git a/extensions/graph/pkg/service/v0/password.go b/services/graph/pkg/service/v0/password.go
similarity index 100%
rename from extensions/graph/pkg/service/v0/password.go
rename to services/graph/pkg/service/v0/password.go
diff --git a/extensions/graph/pkg/service/v0/password_test.go b/services/graph/pkg/service/v0/password_test.go
similarity index 100%
rename from extensions/graph/pkg/service/v0/password_test.go
rename to services/graph/pkg/service/v0/password_test.go
diff --git a/extensions/graph/pkg/service/v0/service.go b/services/graph/pkg/service/v0/service.go
similarity index 100%
rename from extensions/graph/pkg/service/v0/service.go
rename to services/graph/pkg/service/v0/service.go
diff --git a/extensions/graph/pkg/service/v0/service_test.go b/services/graph/pkg/service/v0/service_test.go
similarity index 100%
rename from extensions/graph/pkg/service/v0/service_test.go
rename to services/graph/pkg/service/v0/service_test.go
diff --git a/extensions/graph/pkg/service/v0/tracing.go b/services/graph/pkg/service/v0/tracing.go
similarity index 100%
rename from extensions/graph/pkg/service/v0/tracing.go
rename to services/graph/pkg/service/v0/tracing.go
diff --git a/extensions/graph/pkg/service/v0/users.go b/services/graph/pkg/service/v0/users.go
similarity index 100%
rename from extensions/graph/pkg/service/v0/users.go
rename to services/graph/pkg/service/v0/users.go
diff --git a/extensions/graph/pkg/tracing/tracing.go b/services/graph/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/graph/pkg/tracing/tracing.go
rename to services/graph/pkg/tracing/tracing.go
diff --git a/extensions/graph/reflex.conf b/services/graph/reflex.conf
similarity index 100%
rename from extensions/graph/reflex.conf
rename to services/graph/reflex.conf
diff --git a/extensions/groups/Makefile b/services/groups/Makefile
similarity index 100%
rename from extensions/groups/Makefile
rename to services/groups/Makefile
diff --git a/extensions/groups/cmd/groups/main.go b/services/groups/cmd/groups/main.go
similarity index 100%
rename from extensions/groups/cmd/groups/main.go
rename to services/groups/cmd/groups/main.go
diff --git a/extensions/groups/pkg/command/health.go b/services/groups/pkg/command/health.go
similarity index 100%
rename from extensions/groups/pkg/command/health.go
rename to services/groups/pkg/command/health.go
diff --git a/extensions/groups/pkg/command/root.go b/services/groups/pkg/command/root.go
similarity index 100%
rename from extensions/groups/pkg/command/root.go
rename to services/groups/pkg/command/root.go
diff --git a/extensions/groups/pkg/command/server.go b/services/groups/pkg/command/server.go
similarity index 100%
rename from extensions/groups/pkg/command/server.go
rename to services/groups/pkg/command/server.go
diff --git a/extensions/groups/pkg/command/version.go b/services/groups/pkg/command/version.go
similarity index 100%
rename from extensions/groups/pkg/command/version.go
rename to services/groups/pkg/command/version.go
diff --git a/extensions/groups/pkg/config/config.go b/services/groups/pkg/config/config.go
similarity index 100%
rename from extensions/groups/pkg/config/config.go
rename to services/groups/pkg/config/config.go
diff --git a/extensions/groups/pkg/config/defaults/defaultconfig.go b/services/groups/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/groups/pkg/config/defaults/defaultconfig.go
rename to services/groups/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/groups/pkg/config/parser/parse.go b/services/groups/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/groups/pkg/config/parser/parse.go
rename to services/groups/pkg/config/parser/parse.go
diff --git a/extensions/groups/pkg/config/reva.go b/services/groups/pkg/config/reva.go
similarity index 100%
rename from extensions/groups/pkg/config/reva.go
rename to services/groups/pkg/config/reva.go
diff --git a/extensions/groups/pkg/logging/logging.go b/services/groups/pkg/logging/logging.go
similarity index 100%
rename from extensions/groups/pkg/logging/logging.go
rename to services/groups/pkg/logging/logging.go
diff --git a/extensions/groups/pkg/revaconfig/config.go b/services/groups/pkg/revaconfig/config.go
similarity index 100%
rename from extensions/groups/pkg/revaconfig/config.go
rename to services/groups/pkg/revaconfig/config.go
diff --git a/extensions/groups/pkg/server/debug/option.go b/services/groups/pkg/server/debug/option.go
similarity index 100%
rename from extensions/groups/pkg/server/debug/option.go
rename to services/groups/pkg/server/debug/option.go
diff --git a/extensions/groups/pkg/server/debug/server.go b/services/groups/pkg/server/debug/server.go
similarity index 100%
rename from extensions/groups/pkg/server/debug/server.go
rename to services/groups/pkg/server/debug/server.go
diff --git a/extensions/groups/pkg/tracing/tracing.go b/services/groups/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/groups/pkg/tracing/tracing.go
rename to services/groups/pkg/tracing/tracing.go
diff --git a/extensions/idm/Makefile b/services/idm/Makefile
similarity index 100%
rename from extensions/idm/Makefile
rename to services/idm/Makefile
diff --git a/extensions/idm/cmd/idm/main.go b/services/idm/cmd/idm/main.go
similarity index 100%
rename from extensions/idm/cmd/idm/main.go
rename to services/idm/cmd/idm/main.go
diff --git a/extensions/idm/idm.go b/services/idm/idm.go
similarity index 100%
rename from extensions/idm/idm.go
rename to services/idm/idm.go
diff --git a/extensions/idm/ldif/base.ldif.tmpl b/services/idm/ldif/base.ldif.tmpl
similarity index 100%
rename from extensions/idm/ldif/base.ldif.tmpl
rename to services/idm/ldif/base.ldif.tmpl
diff --git a/extensions/idm/ldif/demousers.ldif b/services/idm/ldif/demousers.ldif
similarity index 100%
rename from extensions/idm/ldif/demousers.ldif
rename to services/idm/ldif/demousers.ldif
diff --git a/extensions/idm/pkg/command/health.go b/services/idm/pkg/command/health.go
similarity index 100%
rename from extensions/idm/pkg/command/health.go
rename to services/idm/pkg/command/health.go
diff --git a/extensions/idm/pkg/command/root.go b/services/idm/pkg/command/root.go
similarity index 100%
rename from extensions/idm/pkg/command/root.go
rename to services/idm/pkg/command/root.go
diff --git a/extensions/idm/pkg/command/server.go b/services/idm/pkg/command/server.go
similarity index 100%
rename from extensions/idm/pkg/command/server.go
rename to services/idm/pkg/command/server.go
diff --git a/extensions/idm/pkg/command/version.go b/services/idm/pkg/command/version.go
similarity index 100%
rename from extensions/idm/pkg/command/version.go
rename to services/idm/pkg/command/version.go
diff --git a/extensions/idm/pkg/config/config.go b/services/idm/pkg/config/config.go
similarity index 100%
rename from extensions/idm/pkg/config/config.go
rename to services/idm/pkg/config/config.go
diff --git a/extensions/idm/pkg/config/debug.go b/services/idm/pkg/config/debug.go
similarity index 100%
rename from extensions/idm/pkg/config/debug.go
rename to services/idm/pkg/config/debug.go
diff --git a/extensions/idm/pkg/config/defaults/defaultconfig.go b/services/idm/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/idm/pkg/config/defaults/defaultconfig.go
rename to services/idm/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/idm/pkg/config/log.go b/services/idm/pkg/config/log.go
similarity index 100%
rename from extensions/idm/pkg/config/log.go
rename to services/idm/pkg/config/log.go
diff --git a/extensions/idm/pkg/config/parser/parse.go b/services/idm/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/idm/pkg/config/parser/parse.go
rename to services/idm/pkg/config/parser/parse.go
diff --git a/extensions/idm/pkg/config/service.go b/services/idm/pkg/config/service.go
similarity index 100%
rename from extensions/idm/pkg/config/service.go
rename to services/idm/pkg/config/service.go
diff --git a/extensions/idm/pkg/config/tracing.go b/services/idm/pkg/config/tracing.go
similarity index 100%
rename from extensions/idm/pkg/config/tracing.go
rename to services/idm/pkg/config/tracing.go
diff --git a/extensions/idm/pkg/logging/logging.go b/services/idm/pkg/logging/logging.go
similarity index 100%
rename from extensions/idm/pkg/logging/logging.go
rename to services/idm/pkg/logging/logging.go
diff --git a/extensions/idm/pkg/server/debug/option.go b/services/idm/pkg/server/debug/option.go
similarity index 100%
rename from extensions/idm/pkg/server/debug/option.go
rename to services/idm/pkg/server/debug/option.go
diff --git a/extensions/idm/pkg/server/debug/server.go b/services/idm/pkg/server/debug/server.go
similarity index 100%
rename from extensions/idm/pkg/server/debug/server.go
rename to services/idm/pkg/server/debug/server.go
diff --git a/extensions/idp/.dockerignore b/services/idp/.dockerignore
similarity index 100%
rename from extensions/idp/.dockerignore
rename to services/idp/.dockerignore
diff --git a/extensions/idp/.env b/services/idp/.env
similarity index 100%
rename from extensions/idp/.env
rename to services/idp/.env
diff --git a/extensions/idp/.eslintignore b/services/idp/.eslintignore
similarity index 100%
rename from extensions/idp/.eslintignore
rename to services/idp/.eslintignore
diff --git a/extensions/idp/.eslintrc.json b/services/idp/.eslintrc.json
similarity index 100%
rename from extensions/idp/.eslintrc.json
rename to services/idp/.eslintrc.json
diff --git a/extensions/idp/.gitignore b/services/idp/.gitignore
similarity index 100%
rename from extensions/idp/.gitignore
rename to services/idp/.gitignore
diff --git a/extensions/idp/.yarn/releases/yarn-3.1.0.cjs b/services/idp/.yarn/releases/yarn-3.1.0.cjs
similarity index 100%
rename from extensions/idp/.yarn/releases/yarn-3.1.0.cjs
rename to services/idp/.yarn/releases/yarn-3.1.0.cjs
diff --git a/extensions/idp/.yarnrc.yml b/services/idp/.yarnrc.yml
similarity index 100%
rename from extensions/idp/.yarnrc.yml
rename to services/idp/.yarnrc.yml
diff --git a/extensions/idp/Makefile b/services/idp/Makefile
similarity index 100%
rename from extensions/idp/Makefile
rename to services/idp/Makefile
diff --git a/extensions/idp/assets/.keep b/services/idp/assets/.keep
similarity index 100%
rename from extensions/idp/assets/.keep
rename to services/idp/assets/.keep
diff --git a/extensions/idp/cmd/idp/main.go b/services/idp/cmd/idp/main.go
similarity index 100%
rename from extensions/idp/cmd/idp/main.go
rename to services/idp/cmd/idp/main.go
diff --git a/extensions/idp/docker/Dockerfile.linux.amd64 b/services/idp/docker/Dockerfile.linux.amd64
similarity index 100%
rename from extensions/idp/docker/Dockerfile.linux.amd64
rename to services/idp/docker/Dockerfile.linux.amd64
diff --git a/extensions/idp/docker/Dockerfile.linux.arm b/services/idp/docker/Dockerfile.linux.arm
similarity index 100%
rename from extensions/idp/docker/Dockerfile.linux.arm
rename to services/idp/docker/Dockerfile.linux.arm
diff --git a/extensions/idp/docker/Dockerfile.linux.arm64 b/services/idp/docker/Dockerfile.linux.arm64
similarity index 100%
rename from extensions/idp/docker/Dockerfile.linux.arm64
rename to services/idp/docker/Dockerfile.linux.arm64
diff --git a/extensions/idp/docker/manifest.tmpl b/services/idp/docker/manifest.tmpl
similarity index 100%
rename from extensions/idp/docker/manifest.tmpl
rename to services/idp/docker/manifest.tmpl
diff --git a/extensions/idp/idp.go b/services/idp/idp.go
similarity index 100%
rename from extensions/idp/idp.go
rename to services/idp/idp.go
diff --git a/extensions/idp/package.json b/services/idp/package.json
similarity index 100%
rename from extensions/idp/package.json
rename to services/idp/package.json
diff --git a/extensions/idp/pkg/assets/option.go b/services/idp/pkg/assets/option.go
similarity index 100%
rename from extensions/idp/pkg/assets/option.go
rename to services/idp/pkg/assets/option.go
diff --git a/extensions/idp/pkg/backends/cs3/bootstrap/cs3.go b/services/idp/pkg/backends/cs3/bootstrap/cs3.go
similarity index 100%
rename from extensions/idp/pkg/backends/cs3/bootstrap/cs3.go
rename to services/idp/pkg/backends/cs3/bootstrap/cs3.go
diff --git a/extensions/idp/pkg/backends/cs3/identifier/cs3.go b/services/idp/pkg/backends/cs3/identifier/cs3.go
similarity index 100%
rename from extensions/idp/pkg/backends/cs3/identifier/cs3.go
rename to services/idp/pkg/backends/cs3/identifier/cs3.go
diff --git a/extensions/idp/pkg/backends/cs3/identifier/session.go b/services/idp/pkg/backends/cs3/identifier/session.go
similarity index 100%
rename from extensions/idp/pkg/backends/cs3/identifier/session.go
rename to services/idp/pkg/backends/cs3/identifier/session.go
diff --git a/extensions/idp/pkg/backends/cs3/identifier/user.go b/services/idp/pkg/backends/cs3/identifier/user.go
similarity index 100%
rename from extensions/idp/pkg/backends/cs3/identifier/user.go
rename to services/idp/pkg/backends/cs3/identifier/user.go
diff --git a/extensions/idp/pkg/command/health.go b/services/idp/pkg/command/health.go
similarity index 100%
rename from extensions/idp/pkg/command/health.go
rename to services/idp/pkg/command/health.go
diff --git a/extensions/idp/pkg/command/root.go b/services/idp/pkg/command/root.go
similarity index 100%
rename from extensions/idp/pkg/command/root.go
rename to services/idp/pkg/command/root.go
diff --git a/extensions/idp/pkg/command/server.go b/services/idp/pkg/command/server.go
similarity index 100%
rename from extensions/idp/pkg/command/server.go
rename to services/idp/pkg/command/server.go
diff --git a/extensions/idp/pkg/command/version.go b/services/idp/pkg/command/version.go
similarity index 100%
rename from extensions/idp/pkg/command/version.go
rename to services/idp/pkg/command/version.go
diff --git a/extensions/idp/pkg/config/config.go b/services/idp/pkg/config/config.go
similarity index 100%
rename from extensions/idp/pkg/config/config.go
rename to services/idp/pkg/config/config.go
diff --git a/extensions/idp/pkg/config/debug.go b/services/idp/pkg/config/debug.go
similarity index 100%
rename from extensions/idp/pkg/config/debug.go
rename to services/idp/pkg/config/debug.go
diff --git a/extensions/idp/pkg/config/defaults/defaultconfig.go b/services/idp/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/idp/pkg/config/defaults/defaultconfig.go
rename to services/idp/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/idp/pkg/config/http.go b/services/idp/pkg/config/http.go
similarity index 100%
rename from extensions/idp/pkg/config/http.go
rename to services/idp/pkg/config/http.go
diff --git a/extensions/idp/pkg/config/log.go b/services/idp/pkg/config/log.go
similarity index 100%
rename from extensions/idp/pkg/config/log.go
rename to services/idp/pkg/config/log.go
diff --git a/extensions/idp/pkg/config/parser/parse.go b/services/idp/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/idp/pkg/config/parser/parse.go
rename to services/idp/pkg/config/parser/parse.go
diff --git a/extensions/idp/pkg/config/reva.go b/services/idp/pkg/config/reva.go
similarity index 100%
rename from extensions/idp/pkg/config/reva.go
rename to services/idp/pkg/config/reva.go
diff --git a/extensions/idp/pkg/config/service.go b/services/idp/pkg/config/service.go
similarity index 100%
rename from extensions/idp/pkg/config/service.go
rename to services/idp/pkg/config/service.go
diff --git a/extensions/idp/pkg/config/tracing.go b/services/idp/pkg/config/tracing.go
similarity index 100%
rename from extensions/idp/pkg/config/tracing.go
rename to services/idp/pkg/config/tracing.go
diff --git a/extensions/idp/pkg/logging/logging.go b/services/idp/pkg/logging/logging.go
similarity index 100%
rename from extensions/idp/pkg/logging/logging.go
rename to services/idp/pkg/logging/logging.go
diff --git a/extensions/idp/pkg/metrics/metrics.go b/services/idp/pkg/metrics/metrics.go
similarity index 100%
rename from extensions/idp/pkg/metrics/metrics.go
rename to services/idp/pkg/metrics/metrics.go
diff --git a/extensions/idp/pkg/middleware/static.go b/services/idp/pkg/middleware/static.go
similarity index 100%
rename from extensions/idp/pkg/middleware/static.go
rename to services/idp/pkg/middleware/static.go
diff --git a/extensions/idp/pkg/server/debug/option.go b/services/idp/pkg/server/debug/option.go
similarity index 100%
rename from extensions/idp/pkg/server/debug/option.go
rename to services/idp/pkg/server/debug/option.go
diff --git a/extensions/idp/pkg/server/debug/server.go b/services/idp/pkg/server/debug/server.go
similarity index 100%
rename from extensions/idp/pkg/server/debug/server.go
rename to services/idp/pkg/server/debug/server.go
diff --git a/extensions/idp/pkg/server/http/option.go b/services/idp/pkg/server/http/option.go
similarity index 100%
rename from extensions/idp/pkg/server/http/option.go
rename to services/idp/pkg/server/http/option.go
diff --git a/extensions/idp/pkg/server/http/server.go b/services/idp/pkg/server/http/server.go
similarity index 100%
rename from extensions/idp/pkg/server/http/server.go
rename to services/idp/pkg/server/http/server.go
diff --git a/extensions/idp/pkg/service/v0/instrument.go b/services/idp/pkg/service/v0/instrument.go
similarity index 100%
rename from extensions/idp/pkg/service/v0/instrument.go
rename to services/idp/pkg/service/v0/instrument.go
diff --git a/extensions/idp/pkg/service/v0/logging.go b/services/idp/pkg/service/v0/logging.go
similarity index 100%
rename from extensions/idp/pkg/service/v0/logging.go
rename to services/idp/pkg/service/v0/logging.go
diff --git a/extensions/idp/pkg/service/v0/option.go b/services/idp/pkg/service/v0/option.go
similarity index 100%
rename from extensions/idp/pkg/service/v0/option.go
rename to services/idp/pkg/service/v0/option.go
diff --git a/extensions/idp/pkg/service/v0/service.go b/services/idp/pkg/service/v0/service.go
similarity index 100%
rename from extensions/idp/pkg/service/v0/service.go
rename to services/idp/pkg/service/v0/service.go
diff --git a/extensions/idp/pkg/service/v0/tracing.go b/services/idp/pkg/service/v0/tracing.go
similarity index 100%
rename from extensions/idp/pkg/service/v0/tracing.go
rename to services/idp/pkg/service/v0/tracing.go
diff --git a/extensions/idp/pkg/tracing/tracing.go b/services/idp/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/idp/pkg/tracing/tracing.go
rename to services/idp/pkg/tracing/tracing.go
diff --git a/extensions/idp/reflex.conf b/services/idp/reflex.conf
similarity index 100%
rename from extensions/idp/reflex.conf
rename to services/idp/reflex.conf
diff --git a/extensions/idp/scripts/build.js b/services/idp/scripts/build.js
similarity index 100%
rename from extensions/idp/scripts/build.js
rename to services/idp/scripts/build.js
diff --git a/extensions/idp/scripts/start.js b/services/idp/scripts/start.js
similarity index 100%
rename from extensions/idp/scripts/start.js
rename to services/idp/scripts/start.js
diff --git a/extensions/idp/scripts/test.js b/services/idp/scripts/test.js
similarity index 100%
rename from extensions/idp/scripts/test.js
rename to services/idp/scripts/test.js
diff --git a/extensions/idp/ui/i18n/Makefile b/services/idp/ui/i18n/Makefile
similarity index 100%
rename from extensions/idp/ui/i18n/Makefile
rename to services/idp/ui/i18n/Makefile
diff --git a/extensions/idp/ui/i18n/de.po b/services/idp/ui/i18n/de.po
similarity index 100%
rename from extensions/idp/ui/i18n/de.po
rename to services/idp/ui/i18n/de.po
diff --git a/extensions/idp/ui/i18n/es.po b/services/idp/ui/i18n/es.po
similarity index 100%
rename from extensions/idp/ui/i18n/es.po
rename to services/idp/ui/i18n/es.po
diff --git a/extensions/idp/ui/i18n/fr.po b/services/idp/ui/i18n/fr.po
similarity index 100%
rename from extensions/idp/ui/i18n/fr.po
rename to services/idp/ui/i18n/fr.po
diff --git a/extensions/idp/ui/i18n/hi.po b/services/idp/ui/i18n/hi.po
similarity index 100%
rename from extensions/idp/ui/i18n/hi.po
rename to services/idp/ui/i18n/hi.po
diff --git a/extensions/idp/ui/i18n/hr.po b/services/idp/ui/i18n/hr.po
similarity index 100%
rename from extensions/idp/ui/i18n/hr.po
rename to services/idp/ui/i18n/hr.po
diff --git a/extensions/idp/ui/i18n/hu.po b/services/idp/ui/i18n/hu.po
similarity index 100%
rename from extensions/idp/ui/i18n/hu.po
rename to services/idp/ui/i18n/hu.po
diff --git a/extensions/idp/ui/i18n/is.po b/services/idp/ui/i18n/is.po
similarity index 100%
rename from extensions/idp/ui/i18n/is.po
rename to services/idp/ui/i18n/is.po
diff --git a/extensions/idp/ui/i18n/it.po b/services/idp/ui/i18n/it.po
similarity index 100%
rename from extensions/idp/ui/i18n/it.po
rename to services/idp/ui/i18n/it.po
diff --git a/extensions/idp/ui/i18n/ja.po b/services/idp/ui/i18n/ja.po
similarity index 100%
rename from extensions/idp/ui/i18n/ja.po
rename to services/idp/ui/i18n/ja.po
diff --git a/extensions/idp/ui/i18n/konnect-identifier.pot b/services/idp/ui/i18n/konnect-identifier.pot
similarity index 100%
rename from extensions/idp/ui/i18n/konnect-identifier.pot
rename to services/idp/ui/i18n/konnect-identifier.pot
diff --git a/extensions/idp/ui/i18n/nb.po b/services/idp/ui/i18n/nb.po
similarity index 100%
rename from extensions/idp/ui/i18n/nb.po
rename to services/idp/ui/i18n/nb.po
diff --git a/extensions/idp/ui/i18n/nl.po b/services/idp/ui/i18n/nl.po
similarity index 100%
rename from extensions/idp/ui/i18n/nl.po
rename to services/idp/ui/i18n/nl.po
diff --git a/extensions/idp/ui/i18n/pl.po b/services/idp/ui/i18n/pl.po
similarity index 100%
rename from extensions/idp/ui/i18n/pl.po
rename to services/idp/ui/i18n/pl.po
diff --git a/extensions/idp/ui/i18n/pt_PT.po b/services/idp/ui/i18n/pt_PT.po
similarity index 100%
rename from extensions/idp/ui/i18n/pt_PT.po
rename to services/idp/ui/i18n/pt_PT.po
diff --git a/extensions/idp/ui/i18n/ru.po b/services/idp/ui/i18n/ru.po
similarity index 100%
rename from extensions/idp/ui/i18n/ru.po
rename to services/idp/ui/i18n/ru.po
diff --git a/extensions/idp/ui/i18n/sl.po b/services/idp/ui/i18n/sl.po
similarity index 100%
rename from extensions/idp/ui/i18n/sl.po
rename to services/idp/ui/i18n/sl.po
diff --git a/extensions/idp/ui/i18n/src/messages.json b/services/idp/ui/i18n/src/messages.json
similarity index 100%
rename from extensions/idp/ui/i18n/src/messages.json
rename to services/idp/ui/i18n/src/messages.json
diff --git a/extensions/idp/ui/public/index.html b/services/idp/ui/public/index.html
similarity index 100%
rename from extensions/idp/ui/public/index.html
rename to services/idp/ui/public/index.html
diff --git a/extensions/idp/ui/public/static/logo.svg b/services/idp/ui/public/static/logo.svg
similarity index 100%
rename from extensions/idp/ui/public/static/logo.svg
rename to services/idp/ui/public/static/logo.svg
diff --git a/extensions/idp/ui/src/Main.js b/services/idp/ui/src/Main.js
similarity index 100%
rename from extensions/idp/ui/src/Main.js
rename to services/idp/ui/src/Main.js
diff --git a/extensions/idp/ui/src/Main.test.js b/services/idp/ui/src/Main.test.js
similarity index 100%
rename from extensions/idp/ui/src/Main.test.js
rename to services/idp/ui/src/Main.test.js
diff --git a/extensions/idp/ui/src/Routes.js b/services/idp/ui/src/Routes.js
similarity index 100%
rename from extensions/idp/ui/src/Routes.js
rename to services/idp/ui/src/Routes.js
diff --git a/extensions/idp/ui/src/actions/common.js b/services/idp/ui/src/actions/common.js
similarity index 100%
rename from extensions/idp/ui/src/actions/common.js
rename to services/idp/ui/src/actions/common.js
diff --git a/extensions/idp/ui/src/actions/login.js b/services/idp/ui/src/actions/login.js
similarity index 100%
rename from extensions/idp/ui/src/actions/login.js
rename to services/idp/ui/src/actions/login.js
diff --git a/extensions/idp/ui/src/actions/types.js b/services/idp/ui/src/actions/types.js
similarity index 100%
rename from extensions/idp/ui/src/actions/types.js
rename to services/idp/ui/src/actions/types.js
diff --git a/extensions/idp/ui/src/actions/utils.js b/services/idp/ui/src/actions/utils.js
similarity index 100%
rename from extensions/idp/ui/src/actions/utils.js
rename to services/idp/ui/src/actions/utils.js
diff --git a/extensions/idp/ui/src/app.css b/services/idp/ui/src/app.css
similarity index 100%
rename from extensions/idp/ui/src/app.css
rename to services/idp/ui/src/app.css
diff --git a/extensions/idp/ui/src/app.js b/services/idp/ui/src/app.js
similarity index 100%
rename from extensions/idp/ui/src/app.js
rename to services/idp/ui/src/app.js
diff --git a/extensions/idp/ui/src/components/ClientDisplayName.js b/services/idp/ui/src/components/ClientDisplayName.js
similarity index 100%
rename from extensions/idp/ui/src/components/ClientDisplayName.js
rename to services/idp/ui/src/components/ClientDisplayName.js
diff --git a/extensions/idp/ui/src/components/Loading.js b/services/idp/ui/src/components/Loading.js
similarity index 100%
rename from extensions/idp/ui/src/components/Loading.js
rename to services/idp/ui/src/components/Loading.js
diff --git a/extensions/idp/ui/src/components/PrivateRoute.js b/services/idp/ui/src/components/PrivateRoute.js
similarity index 100%
rename from extensions/idp/ui/src/components/PrivateRoute.js
rename to services/idp/ui/src/components/PrivateRoute.js
diff --git a/extensions/idp/ui/src/components/RedirectWithQuery.js b/services/idp/ui/src/components/RedirectWithQuery.js
similarity index 100%
rename from extensions/idp/ui/src/components/RedirectWithQuery.js
rename to services/idp/ui/src/components/RedirectWithQuery.js
diff --git a/extensions/idp/ui/src/components/ResponsiveScreen.js b/services/idp/ui/src/components/ResponsiveScreen.js
similarity index 100%
rename from extensions/idp/ui/src/components/ResponsiveScreen.js
rename to services/idp/ui/src/components/ResponsiveScreen.js
diff --git a/extensions/idp/ui/src/components/ScopesList.js b/services/idp/ui/src/components/ScopesList.js
similarity index 100%
rename from extensions/idp/ui/src/components/ScopesList.js
rename to services/idp/ui/src/components/ScopesList.js
diff --git a/extensions/idp/ui/src/components/TextInput.js b/services/idp/ui/src/components/TextInput.js
similarity index 100%
rename from extensions/idp/ui/src/components/TextInput.js
rename to services/idp/ui/src/components/TextInput.js
diff --git a/extensions/idp/ui/src/containers/Goodbye/Goodbyescreen.js b/services/idp/ui/src/containers/Goodbye/Goodbyescreen.js
similarity index 100%
rename from extensions/idp/ui/src/containers/Goodbye/Goodbyescreen.js
rename to services/idp/ui/src/containers/Goodbye/Goodbyescreen.js
diff --git a/extensions/idp/ui/src/containers/Goodbye/index.js b/services/idp/ui/src/containers/Goodbye/index.js
similarity index 100%
rename from extensions/idp/ui/src/containers/Goodbye/index.js
rename to services/idp/ui/src/containers/Goodbye/index.js
diff --git a/extensions/idp/ui/src/containers/Login/Chooseaccount.js b/services/idp/ui/src/containers/Login/Chooseaccount.js
similarity index 100%
rename from extensions/idp/ui/src/containers/Login/Chooseaccount.js
rename to services/idp/ui/src/containers/Login/Chooseaccount.js
diff --git a/extensions/idp/ui/src/containers/Login/Consent.js b/services/idp/ui/src/containers/Login/Consent.js
similarity index 100%
rename from extensions/idp/ui/src/containers/Login/Consent.js
rename to services/idp/ui/src/containers/Login/Consent.js
diff --git a/extensions/idp/ui/src/containers/Login/Login.js b/services/idp/ui/src/containers/Login/Login.js
similarity index 100%
rename from extensions/idp/ui/src/containers/Login/Login.js
rename to services/idp/ui/src/containers/Login/Login.js
diff --git a/extensions/idp/ui/src/containers/Login/Loginscreen.js b/services/idp/ui/src/containers/Login/Loginscreen.js
similarity index 100%
rename from extensions/idp/ui/src/containers/Login/Loginscreen.js
rename to services/idp/ui/src/containers/Login/Loginscreen.js
diff --git a/extensions/idp/ui/src/containers/Login/index.js b/services/idp/ui/src/containers/Login/index.js
similarity index 100%
rename from extensions/idp/ui/src/containers/Login/index.js
rename to services/idp/ui/src/containers/Login/index.js
diff --git a/extensions/idp/ui/src/containers/Welcome/Welcomescreen.js b/services/idp/ui/src/containers/Welcome/Welcomescreen.js
similarity index 100%
rename from extensions/idp/ui/src/containers/Welcome/Welcomescreen.js
rename to services/idp/ui/src/containers/Welcome/Welcomescreen.js
diff --git a/extensions/idp/ui/src/containers/Welcome/index.js b/services/idp/ui/src/containers/Welcome/index.js
similarity index 100%
rename from extensions/idp/ui/src/containers/Welcome/index.js
rename to services/idp/ui/src/containers/Welcome/index.js
diff --git a/extensions/idp/ui/src/errors/index.js b/services/idp/ui/src/errors/index.js
similarity index 100%
rename from extensions/idp/ui/src/errors/index.js
rename to services/idp/ui/src/errors/index.js
diff --git a/extensions/idp/ui/src/images/background.jpg b/services/idp/ui/src/images/background.jpg
similarity index 100%
rename from extensions/idp/ui/src/images/background.jpg
rename to services/idp/ui/src/images/background.jpg
diff --git a/extensions/idp/ui/src/index.js b/services/idp/ui/src/index.js
similarity index 100%
rename from extensions/idp/ui/src/index.js
rename to services/idp/ui/src/index.js
diff --git a/extensions/idp/ui/src/locales/de.json b/services/idp/ui/src/locales/de.json
similarity index 100%
rename from extensions/idp/ui/src/locales/de.json
rename to services/idp/ui/src/locales/de.json
diff --git a/extensions/idp/ui/src/locales/es.json b/services/idp/ui/src/locales/es.json
similarity index 100%
rename from extensions/idp/ui/src/locales/es.json
rename to services/idp/ui/src/locales/es.json
diff --git a/extensions/idp/ui/src/locales/fr.json b/services/idp/ui/src/locales/fr.json
similarity index 100%
rename from extensions/idp/ui/src/locales/fr.json
rename to services/idp/ui/src/locales/fr.json
diff --git a/extensions/idp/ui/src/locales/hi.json b/services/idp/ui/src/locales/hi.json
similarity index 100%
rename from extensions/idp/ui/src/locales/hi.json
rename to services/idp/ui/src/locales/hi.json
diff --git a/extensions/idp/ui/src/locales/hr.json b/services/idp/ui/src/locales/hr.json
similarity index 100%
rename from extensions/idp/ui/src/locales/hr.json
rename to services/idp/ui/src/locales/hr.json
diff --git a/extensions/idp/ui/src/locales/hu.json b/services/idp/ui/src/locales/hu.json
similarity index 100%
rename from extensions/idp/ui/src/locales/hu.json
rename to services/idp/ui/src/locales/hu.json
diff --git a/extensions/idp/ui/src/locales/index.js b/services/idp/ui/src/locales/index.js
similarity index 100%
rename from extensions/idp/ui/src/locales/index.js
rename to services/idp/ui/src/locales/index.js
diff --git a/extensions/idp/ui/src/locales/is.json b/services/idp/ui/src/locales/is.json
similarity index 100%
rename from extensions/idp/ui/src/locales/is.json
rename to services/idp/ui/src/locales/is.json
diff --git a/extensions/idp/ui/src/locales/it.json b/services/idp/ui/src/locales/it.json
similarity index 100%
rename from extensions/idp/ui/src/locales/it.json
rename to services/idp/ui/src/locales/it.json
diff --git a/extensions/idp/ui/src/locales/ja.json b/services/idp/ui/src/locales/ja.json
similarity index 100%
rename from extensions/idp/ui/src/locales/ja.json
rename to services/idp/ui/src/locales/ja.json
diff --git a/extensions/idp/ui/src/locales/nb.json b/services/idp/ui/src/locales/nb.json
similarity index 100%
rename from extensions/idp/ui/src/locales/nb.json
rename to services/idp/ui/src/locales/nb.json
diff --git a/extensions/idp/ui/src/locales/nl.json b/services/idp/ui/src/locales/nl.json
similarity index 100%
rename from extensions/idp/ui/src/locales/nl.json
rename to services/idp/ui/src/locales/nl.json
diff --git a/extensions/idp/ui/src/locales/pl.json b/services/idp/ui/src/locales/pl.json
similarity index 100%
rename from extensions/idp/ui/src/locales/pl.json
rename to services/idp/ui/src/locales/pl.json
diff --git a/extensions/idp/ui/src/locales/pt_PT.json b/services/idp/ui/src/locales/pt_PT.json
similarity index 100%
rename from extensions/idp/ui/src/locales/pt_PT.json
rename to services/idp/ui/src/locales/pt_PT.json
diff --git a/extensions/idp/ui/src/locales/ru.json b/services/idp/ui/src/locales/ru.json
similarity index 100%
rename from extensions/idp/ui/src/locales/ru.json
rename to services/idp/ui/src/locales/ru.json
diff --git a/extensions/idp/ui/src/locales/sl.json b/services/idp/ui/src/locales/sl.json
similarity index 100%
rename from extensions/idp/ui/src/locales/sl.json
rename to services/idp/ui/src/locales/sl.json
diff --git a/extensions/idp/ui/src/models/hello.js b/services/idp/ui/src/models/hello.js
similarity index 100%
rename from extensions/idp/ui/src/models/hello.js
rename to services/idp/ui/src/models/hello.js
diff --git a/extensions/idp/ui/src/reducers/common.js b/services/idp/ui/src/reducers/common.js
similarity index 100%
rename from extensions/idp/ui/src/reducers/common.js
rename to services/idp/ui/src/reducers/common.js
diff --git a/extensions/idp/ui/src/reducers/index.js b/services/idp/ui/src/reducers/index.js
similarity index 100%
rename from extensions/idp/ui/src/reducers/index.js
rename to services/idp/ui/src/reducers/index.js
diff --git a/extensions/idp/ui/src/reducers/login.js b/services/idp/ui/src/reducers/login.js
similarity index 100%
rename from extensions/idp/ui/src/reducers/login.js
rename to services/idp/ui/src/reducers/login.js
diff --git a/extensions/idp/ui/src/store.js b/services/idp/ui/src/store.js
similarity index 100%
rename from extensions/idp/ui/src/store.js
rename to services/idp/ui/src/store.js
diff --git a/extensions/idp/ui/src/utils.js b/services/idp/ui/src/utils.js
similarity index 100%
rename from extensions/idp/ui/src/utils.js
rename to services/idp/ui/src/utils.js
diff --git a/extensions/idp/ui/src/version.js b/services/idp/ui/src/version.js
similarity index 100%
rename from extensions/idp/ui/src/version.js
rename to services/idp/ui/src/version.js
diff --git a/extensions/idp/ui_config/env.js b/services/idp/ui_config/env.js
similarity index 100%
rename from extensions/idp/ui_config/env.js
rename to services/idp/ui_config/env.js
diff --git a/extensions/idp/ui_config/jest/cssTransform.js b/services/idp/ui_config/jest/cssTransform.js
similarity index 100%
rename from extensions/idp/ui_config/jest/cssTransform.js
rename to services/idp/ui_config/jest/cssTransform.js
diff --git a/extensions/idp/ui_config/jest/fileTransform.js b/services/idp/ui_config/jest/fileTransform.js
similarity index 100%
rename from extensions/idp/ui_config/jest/fileTransform.js
rename to services/idp/ui_config/jest/fileTransform.js
diff --git a/extensions/idp/ui_config/modules.js b/services/idp/ui_config/modules.js
similarity index 100%
rename from extensions/idp/ui_config/modules.js
rename to services/idp/ui_config/modules.js
diff --git a/extensions/idp/ui_config/paths.js b/services/idp/ui_config/paths.js
similarity index 100%
rename from extensions/idp/ui_config/paths.js
rename to services/idp/ui_config/paths.js
diff --git a/extensions/idp/ui_config/pnpTs.js b/services/idp/ui_config/pnpTs.js
similarity index 100%
rename from extensions/idp/ui_config/pnpTs.js
rename to services/idp/ui_config/pnpTs.js
diff --git a/extensions/idp/ui_config/webpack.config.js b/services/idp/ui_config/webpack.config.js
similarity index 100%
rename from extensions/idp/ui_config/webpack.config.js
rename to services/idp/ui_config/webpack.config.js
diff --git a/extensions/idp/ui_config/webpackDevServer.config.js b/services/idp/ui_config/webpackDevServer.config.js
similarity index 100%
rename from extensions/idp/ui_config/webpackDevServer.config.js
rename to services/idp/ui_config/webpackDevServer.config.js
diff --git a/extensions/idp/yarn.lock b/services/idp/yarn.lock
similarity index 100%
rename from extensions/idp/yarn.lock
rename to services/idp/yarn.lock
diff --git a/extensions/nats/Makefile b/services/nats/Makefile
similarity index 100%
rename from extensions/nats/Makefile
rename to services/nats/Makefile
diff --git a/extensions/nats/cmd/nats/main.go b/services/nats/cmd/nats/main.go
similarity index 100%
rename from extensions/nats/cmd/nats/main.go
rename to services/nats/cmd/nats/main.go
diff --git a/extensions/nats/pkg/command/health.go b/services/nats/pkg/command/health.go
similarity index 100%
rename from extensions/nats/pkg/command/health.go
rename to services/nats/pkg/command/health.go
diff --git a/extensions/nats/pkg/command/root.go b/services/nats/pkg/command/root.go
similarity index 100%
rename from extensions/nats/pkg/command/root.go
rename to services/nats/pkg/command/root.go
diff --git a/extensions/nats/pkg/command/server.go b/services/nats/pkg/command/server.go
similarity index 100%
rename from extensions/nats/pkg/command/server.go
rename to services/nats/pkg/command/server.go
diff --git a/extensions/nats/pkg/command/version.go b/services/nats/pkg/command/version.go
similarity index 100%
rename from extensions/nats/pkg/command/version.go
rename to services/nats/pkg/command/version.go
diff --git a/extensions/nats/pkg/config/config.go b/services/nats/pkg/config/config.go
similarity index 100%
rename from extensions/nats/pkg/config/config.go
rename to services/nats/pkg/config/config.go
diff --git a/extensions/nats/pkg/config/debug.go b/services/nats/pkg/config/debug.go
similarity index 100%
rename from extensions/nats/pkg/config/debug.go
rename to services/nats/pkg/config/debug.go
diff --git a/extensions/nats/pkg/config/defaults/defaultconfig.go b/services/nats/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/nats/pkg/config/defaults/defaultconfig.go
rename to services/nats/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/nats/pkg/config/log.go b/services/nats/pkg/config/log.go
similarity index 100%
rename from extensions/nats/pkg/config/log.go
rename to services/nats/pkg/config/log.go
diff --git a/extensions/nats/pkg/config/parser/parse.go b/services/nats/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/nats/pkg/config/parser/parse.go
rename to services/nats/pkg/config/parser/parse.go
diff --git a/extensions/nats/pkg/config/service.go b/services/nats/pkg/config/service.go
similarity index 100%
rename from extensions/nats/pkg/config/service.go
rename to services/nats/pkg/config/service.go
diff --git a/extensions/nats/pkg/logging/logging.go b/services/nats/pkg/logging/logging.go
similarity index 100%
rename from extensions/nats/pkg/logging/logging.go
rename to services/nats/pkg/logging/logging.go
diff --git a/extensions/nats/pkg/logging/nats.go b/services/nats/pkg/logging/nats.go
similarity index 100%
rename from extensions/nats/pkg/logging/nats.go
rename to services/nats/pkg/logging/nats.go
diff --git a/extensions/nats/pkg/server/nats/nats.go b/services/nats/pkg/server/nats/nats.go
similarity index 100%
rename from extensions/nats/pkg/server/nats/nats.go
rename to services/nats/pkg/server/nats/nats.go
diff --git a/extensions/nats/pkg/server/nats/options.go b/services/nats/pkg/server/nats/options.go
similarity index 100%
rename from extensions/nats/pkg/server/nats/options.go
rename to services/nats/pkg/server/nats/options.go
diff --git a/extensions/notifications/Makefile b/services/notifications/Makefile
similarity index 100%
rename from extensions/notifications/Makefile
rename to services/notifications/Makefile
diff --git a/extensions/notifications/cmd/notifications/main.go b/services/notifications/cmd/notifications/main.go
similarity index 100%
rename from extensions/notifications/cmd/notifications/main.go
rename to services/notifications/cmd/notifications/main.go
diff --git a/extensions/notifications/pkg/channels/channels.go b/services/notifications/pkg/channels/channels.go
similarity index 100%
rename from extensions/notifications/pkg/channels/channels.go
rename to services/notifications/pkg/channels/channels.go
diff --git a/extensions/notifications/pkg/command/health.go b/services/notifications/pkg/command/health.go
similarity index 100%
rename from extensions/notifications/pkg/command/health.go
rename to services/notifications/pkg/command/health.go
diff --git a/extensions/notifications/pkg/command/root.go b/services/notifications/pkg/command/root.go
similarity index 100%
rename from extensions/notifications/pkg/command/root.go
rename to services/notifications/pkg/command/root.go
diff --git a/extensions/notifications/pkg/command/server.go b/services/notifications/pkg/command/server.go
similarity index 100%
rename from extensions/notifications/pkg/command/server.go
rename to services/notifications/pkg/command/server.go
diff --git a/extensions/notifications/pkg/command/version.go b/services/notifications/pkg/command/version.go
similarity index 100%
rename from extensions/notifications/pkg/command/version.go
rename to services/notifications/pkg/command/version.go
diff --git a/extensions/notifications/pkg/config/config.go b/services/notifications/pkg/config/config.go
similarity index 100%
rename from extensions/notifications/pkg/config/config.go
rename to services/notifications/pkg/config/config.go
diff --git a/extensions/notifications/pkg/config/debug.go b/services/notifications/pkg/config/debug.go
similarity index 100%
rename from extensions/notifications/pkg/config/debug.go
rename to services/notifications/pkg/config/debug.go
diff --git a/extensions/notifications/pkg/config/defaults/defaultconfig.go b/services/notifications/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/notifications/pkg/config/defaults/defaultconfig.go
rename to services/notifications/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/notifications/pkg/config/log.go b/services/notifications/pkg/config/log.go
similarity index 100%
rename from extensions/notifications/pkg/config/log.go
rename to services/notifications/pkg/config/log.go
diff --git a/extensions/notifications/pkg/config/parser/parse.go b/services/notifications/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/notifications/pkg/config/parser/parse.go
rename to services/notifications/pkg/config/parser/parse.go
diff --git a/extensions/notifications/pkg/config/service.go b/services/notifications/pkg/config/service.go
similarity index 100%
rename from extensions/notifications/pkg/config/service.go
rename to services/notifications/pkg/config/service.go
diff --git a/extensions/notifications/pkg/logging/logging.go b/services/notifications/pkg/logging/logging.go
similarity index 100%
rename from extensions/notifications/pkg/logging/logging.go
rename to services/notifications/pkg/logging/logging.go
diff --git a/extensions/notifications/pkg/service/service.go b/services/notifications/pkg/service/service.go
similarity index 100%
rename from extensions/notifications/pkg/service/service.go
rename to services/notifications/pkg/service/service.go
diff --git a/extensions/ocdav/Makefile b/services/ocdav/Makefile
similarity index 100%
rename from extensions/ocdav/Makefile
rename to services/ocdav/Makefile
diff --git a/extensions/ocdav/cmd/ocdav/main.go b/services/ocdav/cmd/ocdav/main.go
similarity index 100%
rename from extensions/ocdav/cmd/ocdav/main.go
rename to services/ocdav/cmd/ocdav/main.go
diff --git a/extensions/ocdav/pkg/command/health.go b/services/ocdav/pkg/command/health.go
similarity index 100%
rename from extensions/ocdav/pkg/command/health.go
rename to services/ocdav/pkg/command/health.go
diff --git a/extensions/ocdav/pkg/command/root.go b/services/ocdav/pkg/command/root.go
similarity index 100%
rename from extensions/ocdav/pkg/command/root.go
rename to services/ocdav/pkg/command/root.go
diff --git a/extensions/ocdav/pkg/command/server.go b/services/ocdav/pkg/command/server.go
similarity index 100%
rename from extensions/ocdav/pkg/command/server.go
rename to services/ocdav/pkg/command/server.go
diff --git a/extensions/ocdav/pkg/command/version.go b/services/ocdav/pkg/command/version.go
similarity index 100%
rename from extensions/ocdav/pkg/command/version.go
rename to services/ocdav/pkg/command/version.go
diff --git a/extensions/ocdav/pkg/config/config.go b/services/ocdav/pkg/config/config.go
similarity index 100%
rename from extensions/ocdav/pkg/config/config.go
rename to services/ocdav/pkg/config/config.go
diff --git a/extensions/ocdav/pkg/config/defaults/defaultconfig.go b/services/ocdav/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/ocdav/pkg/config/defaults/defaultconfig.go
rename to services/ocdav/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/ocdav/pkg/config/parser/parse.go b/services/ocdav/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/ocdav/pkg/config/parser/parse.go
rename to services/ocdav/pkg/config/parser/parse.go
diff --git a/extensions/ocdav/pkg/config/reva.go b/services/ocdav/pkg/config/reva.go
similarity index 100%
rename from extensions/ocdav/pkg/config/reva.go
rename to services/ocdav/pkg/config/reva.go
diff --git a/extensions/ocdav/pkg/logging/logging.go b/services/ocdav/pkg/logging/logging.go
similarity index 100%
rename from extensions/ocdav/pkg/logging/logging.go
rename to services/ocdav/pkg/logging/logging.go
diff --git a/extensions/ocdav/pkg/server/debug/option.go b/services/ocdav/pkg/server/debug/option.go
similarity index 100%
rename from extensions/ocdav/pkg/server/debug/option.go
rename to services/ocdav/pkg/server/debug/option.go
diff --git a/extensions/ocdav/pkg/server/debug/server.go b/services/ocdav/pkg/server/debug/server.go
similarity index 100%
rename from extensions/ocdav/pkg/server/debug/server.go
rename to services/ocdav/pkg/server/debug/server.go
diff --git a/extensions/ocdav/pkg/tracing/tracing.go b/services/ocdav/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/ocdav/pkg/tracing/tracing.go
rename to services/ocdav/pkg/tracing/tracing.go
diff --git a/extensions/ocs/.dockerignore b/services/ocs/.dockerignore
similarity index 100%
rename from extensions/ocs/.dockerignore
rename to services/ocs/.dockerignore
diff --git a/extensions/ocs/Makefile b/services/ocs/Makefile
similarity index 100%
rename from extensions/ocs/Makefile
rename to services/ocs/Makefile
diff --git a/extensions/ocs/cmd/ocs/main.go b/services/ocs/cmd/ocs/main.go
similarity index 100%
rename from extensions/ocs/cmd/ocs/main.go
rename to services/ocs/cmd/ocs/main.go
diff --git a/extensions/ocs/config/.gitignore b/services/ocs/config/.gitignore
similarity index 100%
rename from extensions/ocs/config/.gitignore
rename to services/ocs/config/.gitignore
diff --git a/extensions/ocs/docker/Dockerfile.linux.amd64 b/services/ocs/docker/Dockerfile.linux.amd64
similarity index 100%
rename from extensions/ocs/docker/Dockerfile.linux.amd64
rename to services/ocs/docker/Dockerfile.linux.amd64
diff --git a/extensions/ocs/docker/Dockerfile.linux.arm b/services/ocs/docker/Dockerfile.linux.arm
similarity index 100%
rename from extensions/ocs/docker/Dockerfile.linux.arm
rename to services/ocs/docker/Dockerfile.linux.arm
diff --git a/extensions/ocs/docker/Dockerfile.linux.arm64 b/services/ocs/docker/Dockerfile.linux.arm64
similarity index 100%
rename from extensions/ocs/docker/Dockerfile.linux.arm64
rename to services/ocs/docker/Dockerfile.linux.arm64
diff --git a/extensions/ocs/docker/manifest.tmpl b/services/ocs/docker/manifest.tmpl
similarity index 100%
rename from extensions/ocs/docker/manifest.tmpl
rename to services/ocs/docker/manifest.tmpl
diff --git a/extensions/ocs/pkg/command/health.go b/services/ocs/pkg/command/health.go
similarity index 100%
rename from extensions/ocs/pkg/command/health.go
rename to services/ocs/pkg/command/health.go
diff --git a/extensions/ocs/pkg/command/root.go b/services/ocs/pkg/command/root.go
similarity index 100%
rename from extensions/ocs/pkg/command/root.go
rename to services/ocs/pkg/command/root.go
diff --git a/extensions/ocs/pkg/command/server.go b/services/ocs/pkg/command/server.go
similarity index 100%
rename from extensions/ocs/pkg/command/server.go
rename to services/ocs/pkg/command/server.go
diff --git a/extensions/ocs/pkg/command/version.go b/services/ocs/pkg/command/version.go
similarity index 100%
rename from extensions/ocs/pkg/command/version.go
rename to services/ocs/pkg/command/version.go
diff --git a/extensions/ocs/pkg/config/config.go b/services/ocs/pkg/config/config.go
similarity index 100%
rename from extensions/ocs/pkg/config/config.go
rename to services/ocs/pkg/config/config.go
diff --git a/extensions/ocs/pkg/config/debug.go b/services/ocs/pkg/config/debug.go
similarity index 100%
rename from extensions/ocs/pkg/config/debug.go
rename to services/ocs/pkg/config/debug.go
diff --git a/extensions/ocs/pkg/config/defaults/defaultconfig.go b/services/ocs/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/ocs/pkg/config/defaults/defaultconfig.go
rename to services/ocs/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/ocs/pkg/config/http.go b/services/ocs/pkg/config/http.go
similarity index 100%
rename from extensions/ocs/pkg/config/http.go
rename to services/ocs/pkg/config/http.go
diff --git a/extensions/ocs/pkg/config/log.go b/services/ocs/pkg/config/log.go
similarity index 100%
rename from extensions/ocs/pkg/config/log.go
rename to services/ocs/pkg/config/log.go
diff --git a/extensions/ocs/pkg/config/parser/parse.go b/services/ocs/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/ocs/pkg/config/parser/parse.go
rename to services/ocs/pkg/config/parser/parse.go
diff --git a/extensions/ocs/pkg/config/reva.go b/services/ocs/pkg/config/reva.go
similarity index 100%
rename from extensions/ocs/pkg/config/reva.go
rename to services/ocs/pkg/config/reva.go
diff --git a/extensions/ocs/pkg/config/service.go b/services/ocs/pkg/config/service.go
similarity index 100%
rename from extensions/ocs/pkg/config/service.go
rename to services/ocs/pkg/config/service.go
diff --git a/extensions/ocs/pkg/config/tracing.go b/services/ocs/pkg/config/tracing.go
similarity index 100%
rename from extensions/ocs/pkg/config/tracing.go
rename to services/ocs/pkg/config/tracing.go
diff --git a/extensions/ocs/pkg/logging/logging.go b/services/ocs/pkg/logging/logging.go
similarity index 100%
rename from extensions/ocs/pkg/logging/logging.go
rename to services/ocs/pkg/logging/logging.go
diff --git a/extensions/ocs/pkg/metrics/metrics.go b/services/ocs/pkg/metrics/metrics.go
similarity index 100%
rename from extensions/ocs/pkg/metrics/metrics.go
rename to services/ocs/pkg/metrics/metrics.go
diff --git a/extensions/ocs/pkg/middleware/format.go b/services/ocs/pkg/middleware/format.go
similarity index 100%
rename from extensions/ocs/pkg/middleware/format.go
rename to services/ocs/pkg/middleware/format.go
diff --git a/extensions/ocs/pkg/middleware/logtrace.go b/services/ocs/pkg/middleware/logtrace.go
similarity index 100%
rename from extensions/ocs/pkg/middleware/logtrace.go
rename to services/ocs/pkg/middleware/logtrace.go
diff --git a/extensions/ocs/pkg/middleware/options.go b/services/ocs/pkg/middleware/options.go
similarity index 100%
rename from extensions/ocs/pkg/middleware/options.go
rename to services/ocs/pkg/middleware/options.go
diff --git a/extensions/ocs/pkg/middleware/requireadmin.go b/services/ocs/pkg/middleware/requireadmin.go
similarity index 100%
rename from extensions/ocs/pkg/middleware/requireadmin.go
rename to services/ocs/pkg/middleware/requireadmin.go
diff --git a/extensions/ocs/pkg/middleware/requireselforadmin.go b/services/ocs/pkg/middleware/requireselforadmin.go
similarity index 100%
rename from extensions/ocs/pkg/middleware/requireselforadmin.go
rename to services/ocs/pkg/middleware/requireselforadmin.go
diff --git a/extensions/ocs/pkg/middleware/requireuser.go b/services/ocs/pkg/middleware/requireuser.go
similarity index 100%
rename from extensions/ocs/pkg/middleware/requireuser.go
rename to services/ocs/pkg/middleware/requireuser.go
diff --git a/extensions/ocs/pkg/server/debug/option.go b/services/ocs/pkg/server/debug/option.go
similarity index 100%
rename from extensions/ocs/pkg/server/debug/option.go
rename to services/ocs/pkg/server/debug/option.go
diff --git a/extensions/ocs/pkg/server/debug/server.go b/services/ocs/pkg/server/debug/server.go
similarity index 100%
rename from extensions/ocs/pkg/server/debug/server.go
rename to services/ocs/pkg/server/debug/server.go
diff --git a/extensions/ocs/pkg/server/http/option.go b/services/ocs/pkg/server/http/option.go
similarity index 100%
rename from extensions/ocs/pkg/server/http/option.go
rename to services/ocs/pkg/server/http/option.go
diff --git a/extensions/ocs/pkg/server/http/server.go b/services/ocs/pkg/server/http/server.go
similarity index 100%
rename from extensions/ocs/pkg/server/http/server.go
rename to services/ocs/pkg/server/http/server.go
diff --git a/extensions/ocs/pkg/service/v0/config.go b/services/ocs/pkg/service/v0/config.go
similarity index 100%
rename from extensions/ocs/pkg/service/v0/config.go
rename to services/ocs/pkg/service/v0/config.go
diff --git a/extensions/ocs/pkg/service/v0/data/config.go b/services/ocs/pkg/service/v0/data/config.go
similarity index 100%
rename from extensions/ocs/pkg/service/v0/data/config.go
rename to services/ocs/pkg/service/v0/data/config.go
diff --git a/extensions/ocs/pkg/service/v0/data/group.go b/services/ocs/pkg/service/v0/data/group.go
similarity index 100%
rename from extensions/ocs/pkg/service/v0/data/group.go
rename to services/ocs/pkg/service/v0/data/group.go
diff --git a/extensions/ocs/pkg/service/v0/data/meta.go b/services/ocs/pkg/service/v0/data/meta.go
similarity index 100%
rename from extensions/ocs/pkg/service/v0/data/meta.go
rename to services/ocs/pkg/service/v0/data/meta.go
diff --git a/extensions/ocs/pkg/service/v0/data/user.go b/services/ocs/pkg/service/v0/data/user.go
similarity index 100%
rename from extensions/ocs/pkg/service/v0/data/user.go
rename to services/ocs/pkg/service/v0/data/user.go
diff --git a/extensions/ocs/pkg/service/v0/groups.go b/services/ocs/pkg/service/v0/groups.go
similarity index 100%
rename from extensions/ocs/pkg/service/v0/groups.go
rename to services/ocs/pkg/service/v0/groups.go
diff --git a/extensions/ocs/pkg/service/v0/instrument.go b/services/ocs/pkg/service/v0/instrument.go
similarity index 100%
rename from extensions/ocs/pkg/service/v0/instrument.go
rename to services/ocs/pkg/service/v0/instrument.go
diff --git a/extensions/ocs/pkg/service/v0/logging.go b/services/ocs/pkg/service/v0/logging.go
similarity index 100%
rename from extensions/ocs/pkg/service/v0/logging.go
rename to services/ocs/pkg/service/v0/logging.go
diff --git a/extensions/ocs/pkg/service/v0/option.go b/services/ocs/pkg/service/v0/option.go
similarity index 100%
rename from extensions/ocs/pkg/service/v0/option.go
rename to services/ocs/pkg/service/v0/option.go
diff --git a/extensions/ocs/pkg/service/v0/response/response.go b/services/ocs/pkg/service/v0/response/response.go
similarity index 100%
rename from extensions/ocs/pkg/service/v0/response/response.go
rename to services/ocs/pkg/service/v0/response/response.go
diff --git a/extensions/ocs/pkg/service/v0/response/version.go b/services/ocs/pkg/service/v0/response/version.go
similarity index 100%
rename from extensions/ocs/pkg/service/v0/response/version.go
rename to services/ocs/pkg/service/v0/response/version.go
diff --git a/extensions/ocs/pkg/service/v0/service.go b/services/ocs/pkg/service/v0/service.go
similarity index 100%
rename from extensions/ocs/pkg/service/v0/service.go
rename to services/ocs/pkg/service/v0/service.go
diff --git a/extensions/ocs/pkg/service/v0/tracing.go b/services/ocs/pkg/service/v0/tracing.go
similarity index 100%
rename from extensions/ocs/pkg/service/v0/tracing.go
rename to services/ocs/pkg/service/v0/tracing.go
diff --git a/extensions/ocs/pkg/service/v0/users.go b/services/ocs/pkg/service/v0/users.go
similarity index 100%
rename from extensions/ocs/pkg/service/v0/users.go
rename to services/ocs/pkg/service/v0/users.go
diff --git a/extensions/ocs/pkg/tracing/tracing.go b/services/ocs/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/ocs/pkg/tracing/tracing.go
rename to services/ocs/pkg/tracing/tracing.go
diff --git a/extensions/ocs/reflex.conf b/services/ocs/reflex.conf
similarity index 100%
rename from extensions/ocs/reflex.conf
rename to services/ocs/reflex.conf
diff --git a/extensions/proxy/.dockerignore b/services/proxy/.dockerignore
similarity index 100%
rename from extensions/proxy/.dockerignore
rename to services/proxy/.dockerignore
diff --git a/extensions/proxy/Makefile b/services/proxy/Makefile
similarity index 100%
rename from extensions/proxy/Makefile
rename to services/proxy/Makefile
diff --git a/extensions/proxy/cmd/proxy/main.go b/services/proxy/cmd/proxy/main.go
similarity index 100%
rename from extensions/proxy/cmd/proxy/main.go
rename to services/proxy/cmd/proxy/main.go
diff --git a/extensions/proxy/docker/Dockerfile.linux.amd64 b/services/proxy/docker/Dockerfile.linux.amd64
similarity index 100%
rename from extensions/proxy/docker/Dockerfile.linux.amd64
rename to services/proxy/docker/Dockerfile.linux.amd64
diff --git a/extensions/proxy/docker/Dockerfile.linux.arm b/services/proxy/docker/Dockerfile.linux.arm
similarity index 100%
rename from extensions/proxy/docker/Dockerfile.linux.arm
rename to services/proxy/docker/Dockerfile.linux.arm
diff --git a/extensions/proxy/docker/Dockerfile.linux.arm64 b/services/proxy/docker/Dockerfile.linux.arm64
similarity index 100%
rename from extensions/proxy/docker/Dockerfile.linux.arm64
rename to services/proxy/docker/Dockerfile.linux.arm64
diff --git a/extensions/proxy/docker/manifest.tmpl b/services/proxy/docker/manifest.tmpl
similarity index 100%
rename from extensions/proxy/docker/manifest.tmpl
rename to services/proxy/docker/manifest.tmpl
diff --git a/extensions/proxy/pkg/command/health.go b/services/proxy/pkg/command/health.go
similarity index 100%
rename from extensions/proxy/pkg/command/health.go
rename to services/proxy/pkg/command/health.go
diff --git a/extensions/proxy/pkg/command/root.go b/services/proxy/pkg/command/root.go
similarity index 100%
rename from extensions/proxy/pkg/command/root.go
rename to services/proxy/pkg/command/root.go
diff --git a/extensions/proxy/pkg/command/server.go b/services/proxy/pkg/command/server.go
similarity index 100%
rename from extensions/proxy/pkg/command/server.go
rename to services/proxy/pkg/command/server.go
diff --git a/extensions/proxy/pkg/command/version.go b/services/proxy/pkg/command/version.go
similarity index 100%
rename from extensions/proxy/pkg/command/version.go
rename to services/proxy/pkg/command/version.go
diff --git a/extensions/proxy/pkg/config/config.go b/services/proxy/pkg/config/config.go
similarity index 100%
rename from extensions/proxy/pkg/config/config.go
rename to services/proxy/pkg/config/config.go
diff --git a/extensions/proxy/pkg/config/debug.go b/services/proxy/pkg/config/debug.go
similarity index 100%
rename from extensions/proxy/pkg/config/debug.go
rename to services/proxy/pkg/config/debug.go
diff --git a/extensions/proxy/pkg/config/defaults/defaultconfig.go b/services/proxy/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/proxy/pkg/config/defaults/defaultconfig.go
rename to services/proxy/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/proxy/pkg/config/http.go b/services/proxy/pkg/config/http.go
similarity index 100%
rename from extensions/proxy/pkg/config/http.go
rename to services/proxy/pkg/config/http.go
diff --git a/extensions/proxy/pkg/config/log.go b/services/proxy/pkg/config/log.go
similarity index 100%
rename from extensions/proxy/pkg/config/log.go
rename to services/proxy/pkg/config/log.go
diff --git a/extensions/proxy/pkg/config/parser/parse.go b/services/proxy/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/proxy/pkg/config/parser/parse.go
rename to services/proxy/pkg/config/parser/parse.go
diff --git a/extensions/proxy/pkg/config/reva.go b/services/proxy/pkg/config/reva.go
similarity index 100%
rename from extensions/proxy/pkg/config/reva.go
rename to services/proxy/pkg/config/reva.go
diff --git a/extensions/proxy/pkg/config/service.go b/services/proxy/pkg/config/service.go
similarity index 100%
rename from extensions/proxy/pkg/config/service.go
rename to services/proxy/pkg/config/service.go
diff --git a/extensions/proxy/pkg/config/tracing.go b/services/proxy/pkg/config/tracing.go
similarity index 100%
rename from extensions/proxy/pkg/config/tracing.go
rename to services/proxy/pkg/config/tracing.go
diff --git a/extensions/proxy/pkg/cs3/client.go b/services/proxy/pkg/cs3/client.go
similarity index 100%
rename from extensions/proxy/pkg/cs3/client.go
rename to services/proxy/pkg/cs3/client.go
diff --git a/extensions/proxy/pkg/logging/logging.go b/services/proxy/pkg/logging/logging.go
similarity index 100%
rename from extensions/proxy/pkg/logging/logging.go
rename to services/proxy/pkg/logging/logging.go
diff --git a/extensions/proxy/pkg/metrics/metrics.go b/services/proxy/pkg/metrics/metrics.go
similarity index 100%
rename from extensions/proxy/pkg/metrics/metrics.go
rename to services/proxy/pkg/metrics/metrics.go
diff --git a/extensions/proxy/pkg/middleware/accesslog.go b/services/proxy/pkg/middleware/accesslog.go
similarity index 100%
rename from extensions/proxy/pkg/middleware/accesslog.go
rename to services/proxy/pkg/middleware/accesslog.go
diff --git a/extensions/proxy/pkg/middleware/account_resolver.go b/services/proxy/pkg/middleware/account_resolver.go
similarity index 100%
rename from extensions/proxy/pkg/middleware/account_resolver.go
rename to services/proxy/pkg/middleware/account_resolver.go
diff --git a/extensions/proxy/pkg/middleware/account_resolver_test.go b/services/proxy/pkg/middleware/account_resolver_test.go
similarity index 100%
rename from extensions/proxy/pkg/middleware/account_resolver_test.go
rename to services/proxy/pkg/middleware/account_resolver_test.go
diff --git a/extensions/proxy/pkg/middleware/authentication.go b/services/proxy/pkg/middleware/authentication.go
similarity index 100%
rename from extensions/proxy/pkg/middleware/authentication.go
rename to services/proxy/pkg/middleware/authentication.go
diff --git a/extensions/proxy/pkg/middleware/basic_auth.go b/services/proxy/pkg/middleware/basic_auth.go
similarity index 100%
rename from extensions/proxy/pkg/middleware/basic_auth.go
rename to services/proxy/pkg/middleware/basic_auth.go
diff --git a/extensions/proxy/pkg/middleware/basic_auth_test.go b/services/proxy/pkg/middleware/basic_auth_test.go
similarity index 100%
rename from extensions/proxy/pkg/middleware/basic_auth_test.go
rename to services/proxy/pkg/middleware/basic_auth_test.go
diff --git a/extensions/proxy/pkg/middleware/create_home.go b/services/proxy/pkg/middleware/create_home.go
similarity index 100%
rename from extensions/proxy/pkg/middleware/create_home.go
rename to services/proxy/pkg/middleware/create_home.go
diff --git a/extensions/proxy/pkg/middleware/https_redirect.go b/services/proxy/pkg/middleware/https_redirect.go
similarity index 100%
rename from extensions/proxy/pkg/middleware/https_redirect.go
rename to services/proxy/pkg/middleware/https_redirect.go
diff --git a/extensions/proxy/pkg/middleware/oidc_auth.go b/services/proxy/pkg/middleware/oidc_auth.go
similarity index 100%
rename from extensions/proxy/pkg/middleware/oidc_auth.go
rename to services/proxy/pkg/middleware/oidc_auth.go
diff --git a/extensions/proxy/pkg/middleware/oidc_auth_test.go b/services/proxy/pkg/middleware/oidc_auth_test.go
similarity index 100%
rename from extensions/proxy/pkg/middleware/oidc_auth_test.go
rename to services/proxy/pkg/middleware/oidc_auth_test.go
diff --git a/extensions/proxy/pkg/middleware/options.go b/services/proxy/pkg/middleware/options.go
similarity index 100%
rename from extensions/proxy/pkg/middleware/options.go
rename to services/proxy/pkg/middleware/options.go
diff --git a/extensions/proxy/pkg/middleware/public_share_auth.go b/services/proxy/pkg/middleware/public_share_auth.go
similarity index 100%
rename from extensions/proxy/pkg/middleware/public_share_auth.go
rename to services/proxy/pkg/middleware/public_share_auth.go
diff --git a/extensions/proxy/pkg/middleware/selector_cookie.go b/services/proxy/pkg/middleware/selector_cookie.go
similarity index 100%
rename from extensions/proxy/pkg/middleware/selector_cookie.go
rename to services/proxy/pkg/middleware/selector_cookie.go
diff --git a/extensions/proxy/pkg/middleware/signed_url_auth.go b/services/proxy/pkg/middleware/signed_url_auth.go
similarity index 100%
rename from extensions/proxy/pkg/middleware/signed_url_auth.go
rename to services/proxy/pkg/middleware/signed_url_auth.go
diff --git a/extensions/proxy/pkg/middleware/signed_url_auth_test.go b/services/proxy/pkg/middleware/signed_url_auth_test.go
similarity index 100%
rename from extensions/proxy/pkg/middleware/signed_url_auth_test.go
rename to services/proxy/pkg/middleware/signed_url_auth_test.go
diff --git a/extensions/proxy/pkg/proxy/option.go b/services/proxy/pkg/proxy/option.go
similarity index 100%
rename from extensions/proxy/pkg/proxy/option.go
rename to services/proxy/pkg/proxy/option.go
diff --git a/extensions/proxy/pkg/proxy/policy/selector.go b/services/proxy/pkg/proxy/policy/selector.go
similarity index 100%
rename from extensions/proxy/pkg/proxy/policy/selector.go
rename to services/proxy/pkg/proxy/policy/selector.go
diff --git a/extensions/proxy/pkg/proxy/policy/selector_test.go b/services/proxy/pkg/proxy/policy/selector_test.go
similarity index 100%
rename from extensions/proxy/pkg/proxy/policy/selector_test.go
rename to services/proxy/pkg/proxy/policy/selector_test.go
diff --git a/extensions/proxy/pkg/proxy/proxy.go b/services/proxy/pkg/proxy/proxy.go
similarity index 100%
rename from extensions/proxy/pkg/proxy/proxy.go
rename to services/proxy/pkg/proxy/proxy.go
diff --git a/extensions/proxy/pkg/proxy/proxy_integration_test.go b/services/proxy/pkg/proxy/proxy_integration_test.go
similarity index 100%
rename from extensions/proxy/pkg/proxy/proxy_integration_test.go
rename to services/proxy/pkg/proxy/proxy_integration_test.go
diff --git a/extensions/proxy/pkg/proxy/proxy_test.go b/services/proxy/pkg/proxy/proxy_test.go
similarity index 100%
rename from extensions/proxy/pkg/proxy/proxy_test.go
rename to services/proxy/pkg/proxy/proxy_test.go
diff --git a/extensions/proxy/pkg/server/debug/option.go b/services/proxy/pkg/server/debug/option.go
similarity index 100%
rename from extensions/proxy/pkg/server/debug/option.go
rename to services/proxy/pkg/server/debug/option.go
diff --git a/extensions/proxy/pkg/server/debug/server.go b/services/proxy/pkg/server/debug/server.go
similarity index 100%
rename from extensions/proxy/pkg/server/debug/server.go
rename to services/proxy/pkg/server/debug/server.go
diff --git a/extensions/proxy/pkg/server/http/option.go b/services/proxy/pkg/server/http/option.go
similarity index 100%
rename from extensions/proxy/pkg/server/http/option.go
rename to services/proxy/pkg/server/http/option.go
diff --git a/extensions/proxy/pkg/server/http/server.go b/services/proxy/pkg/server/http/server.go
similarity index 100%
rename from extensions/proxy/pkg/server/http/server.go
rename to services/proxy/pkg/server/http/server.go
diff --git a/extensions/proxy/pkg/tracing/tracing.go b/services/proxy/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/proxy/pkg/tracing/tracing.go
rename to services/proxy/pkg/tracing/tracing.go
diff --git a/extensions/proxy/pkg/user/backend/backend.go b/services/proxy/pkg/user/backend/backend.go
similarity index 100%
rename from extensions/proxy/pkg/user/backend/backend.go
rename to services/proxy/pkg/user/backend/backend.go
diff --git a/extensions/proxy/pkg/user/backend/cs3.go b/services/proxy/pkg/user/backend/cs3.go
similarity index 100%
rename from extensions/proxy/pkg/user/backend/cs3.go
rename to services/proxy/pkg/user/backend/cs3.go
diff --git a/extensions/proxy/pkg/user/backend/test/backend_mock.go b/services/proxy/pkg/user/backend/test/backend_mock.go
similarity index 100%
rename from extensions/proxy/pkg/user/backend/test/backend_mock.go
rename to services/proxy/pkg/user/backend/test/backend_mock.go
diff --git a/extensions/proxy/pkg/webdav/response.go b/services/proxy/pkg/webdav/response.go
similarity index 100%
rename from extensions/proxy/pkg/webdav/response.go
rename to services/proxy/pkg/webdav/response.go
diff --git a/extensions/proxy/pkg/webdav/webdav.go b/services/proxy/pkg/webdav/webdav.go
similarity index 100%
rename from extensions/proxy/pkg/webdav/webdav.go
rename to services/proxy/pkg/webdav/webdav.go
diff --git a/extensions/search/cmd/search/main.go b/services/search/cmd/search/main.go
similarity index 100%
rename from extensions/search/cmd/search/main.go
rename to services/search/cmd/search/main.go
diff --git a/extensions/search/pkg/command/health.go b/services/search/pkg/command/health.go
similarity index 100%
rename from extensions/search/pkg/command/health.go
rename to services/search/pkg/command/health.go
diff --git a/extensions/search/pkg/command/index.go b/services/search/pkg/command/index.go
similarity index 100%
rename from extensions/search/pkg/command/index.go
rename to services/search/pkg/command/index.go
diff --git a/extensions/search/pkg/command/root.go b/services/search/pkg/command/root.go
similarity index 100%
rename from extensions/search/pkg/command/root.go
rename to services/search/pkg/command/root.go
diff --git a/extensions/search/pkg/command/server.go b/services/search/pkg/command/server.go
similarity index 100%
rename from extensions/search/pkg/command/server.go
rename to services/search/pkg/command/server.go
diff --git a/extensions/search/pkg/command/version.go b/services/search/pkg/command/version.go
similarity index 100%
rename from extensions/search/pkg/command/version.go
rename to services/search/pkg/command/version.go
diff --git a/extensions/search/pkg/config/config.go b/services/search/pkg/config/config.go
similarity index 100%
rename from extensions/search/pkg/config/config.go
rename to services/search/pkg/config/config.go
diff --git a/extensions/search/pkg/config/debug.go b/services/search/pkg/config/debug.go
similarity index 100%
rename from extensions/search/pkg/config/debug.go
rename to services/search/pkg/config/debug.go
diff --git a/extensions/search/pkg/config/defaults/defaultconfig.go b/services/search/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/search/pkg/config/defaults/defaultconfig.go
rename to services/search/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/search/pkg/config/grpc.go b/services/search/pkg/config/grpc.go
similarity index 100%
rename from extensions/search/pkg/config/grpc.go
rename to services/search/pkg/config/grpc.go
diff --git a/extensions/search/pkg/config/http.go b/services/search/pkg/config/http.go
similarity index 100%
rename from extensions/search/pkg/config/http.go
rename to services/search/pkg/config/http.go
diff --git a/extensions/search/pkg/config/log.go b/services/search/pkg/config/log.go
similarity index 100%
rename from extensions/search/pkg/config/log.go
rename to services/search/pkg/config/log.go
diff --git a/extensions/search/pkg/config/parser/parse.go b/services/search/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/search/pkg/config/parser/parse.go
rename to services/search/pkg/config/parser/parse.go
diff --git a/extensions/search/pkg/config/reva.go b/services/search/pkg/config/reva.go
similarity index 100%
rename from extensions/search/pkg/config/reva.go
rename to services/search/pkg/config/reva.go
diff --git a/extensions/search/pkg/config/service.go b/services/search/pkg/config/service.go
similarity index 100%
rename from extensions/search/pkg/config/service.go
rename to services/search/pkg/config/service.go
diff --git a/extensions/search/pkg/config/tracing.go b/services/search/pkg/config/tracing.go
similarity index 100%
rename from extensions/search/pkg/config/tracing.go
rename to services/search/pkg/config/tracing.go
diff --git a/extensions/search/pkg/logging/logging.go b/services/search/pkg/logging/logging.go
similarity index 100%
rename from extensions/search/pkg/logging/logging.go
rename to services/search/pkg/logging/logging.go
diff --git a/extensions/search/pkg/metrics/metrics.go b/services/search/pkg/metrics/metrics.go
similarity index 100%
rename from extensions/search/pkg/metrics/metrics.go
rename to services/search/pkg/metrics/metrics.go
diff --git a/extensions/search/pkg/search/index/index.go b/services/search/pkg/search/index/index.go
similarity index 100%
rename from extensions/search/pkg/search/index/index.go
rename to services/search/pkg/search/index/index.go
diff --git a/extensions/search/pkg/search/index/index_suite_test.go b/services/search/pkg/search/index/index_suite_test.go
similarity index 100%
rename from extensions/search/pkg/search/index/index_suite_test.go
rename to services/search/pkg/search/index/index_suite_test.go
diff --git a/extensions/search/pkg/search/index/index_test.go b/services/search/pkg/search/index/index_test.go
similarity index 100%
rename from extensions/search/pkg/search/index/index_test.go
rename to services/search/pkg/search/index/index_test.go
diff --git a/extensions/search/pkg/search/index/mocks/BleveIndex.go b/services/search/pkg/search/index/mocks/BleveIndex.go
similarity index 100%
rename from extensions/search/pkg/search/index/mocks/BleveIndex.go
rename to services/search/pkg/search/index/mocks/BleveIndex.go
diff --git a/extensions/search/pkg/search/mocks/IndexClient.go b/services/search/pkg/search/mocks/IndexClient.go
similarity index 100%
rename from extensions/search/pkg/search/mocks/IndexClient.go
rename to services/search/pkg/search/mocks/IndexClient.go
diff --git a/extensions/search/pkg/search/mocks/ProviderClient.go b/services/search/pkg/search/mocks/ProviderClient.go
similarity index 100%
rename from extensions/search/pkg/search/mocks/ProviderClient.go
rename to services/search/pkg/search/mocks/ProviderClient.go
diff --git a/extensions/search/pkg/search/provider/events.go b/services/search/pkg/search/provider/events.go
similarity index 100%
rename from extensions/search/pkg/search/provider/events.go
rename to services/search/pkg/search/provider/events.go
diff --git a/extensions/search/pkg/search/provider/events_test.go b/services/search/pkg/search/provider/events_test.go
similarity index 100%
rename from extensions/search/pkg/search/provider/events_test.go
rename to services/search/pkg/search/provider/events_test.go
diff --git a/extensions/search/pkg/search/provider/provider_suite_test.go b/services/search/pkg/search/provider/provider_suite_test.go
similarity index 100%
rename from extensions/search/pkg/search/provider/provider_suite_test.go
rename to services/search/pkg/search/provider/provider_suite_test.go
diff --git a/extensions/search/pkg/search/provider/searchprovider.go b/services/search/pkg/search/provider/searchprovider.go
similarity index 100%
rename from extensions/search/pkg/search/provider/searchprovider.go
rename to services/search/pkg/search/provider/searchprovider.go
diff --git a/extensions/search/pkg/search/provider/searchprovider_test.go b/services/search/pkg/search/provider/searchprovider_test.go
similarity index 100%
rename from extensions/search/pkg/search/provider/searchprovider_test.go
rename to services/search/pkg/search/provider/searchprovider_test.go
diff --git a/extensions/search/pkg/search/search.go b/services/search/pkg/search/search.go
similarity index 100%
rename from extensions/search/pkg/search/search.go
rename to services/search/pkg/search/search.go
diff --git a/extensions/search/pkg/search/search_suite_test.go b/services/search/pkg/search/search_suite_test.go
similarity index 100%
rename from extensions/search/pkg/search/search_suite_test.go
rename to services/search/pkg/search/search_suite_test.go
diff --git a/extensions/search/pkg/server/debug/option.go b/services/search/pkg/server/debug/option.go
similarity index 100%
rename from extensions/search/pkg/server/debug/option.go
rename to services/search/pkg/server/debug/option.go
diff --git a/extensions/search/pkg/server/debug/server.go b/services/search/pkg/server/debug/server.go
similarity index 100%
rename from extensions/search/pkg/server/debug/server.go
rename to services/search/pkg/server/debug/server.go
diff --git a/extensions/search/pkg/server/grpc/option.go b/services/search/pkg/server/grpc/option.go
similarity index 100%
rename from extensions/search/pkg/server/grpc/option.go
rename to services/search/pkg/server/grpc/option.go
diff --git a/extensions/search/pkg/server/grpc/server.go b/services/search/pkg/server/grpc/server.go
similarity index 100%
rename from extensions/search/pkg/server/grpc/server.go
rename to services/search/pkg/server/grpc/server.go
diff --git a/extensions/search/pkg/service/v0/option.go b/services/search/pkg/service/v0/option.go
similarity index 100%
rename from extensions/search/pkg/service/v0/option.go
rename to services/search/pkg/service/v0/option.go
diff --git a/extensions/search/pkg/service/v0/service.go b/services/search/pkg/service/v0/service.go
similarity index 100%
rename from extensions/search/pkg/service/v0/service.go
rename to services/search/pkg/service/v0/service.go
diff --git a/extensions/search/pkg/tracing/tracing.go b/services/search/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/search/pkg/tracing/tracing.go
rename to services/search/pkg/tracing/tracing.go
diff --git a/extensions/settings/.dockerignore b/services/settings/.dockerignore
similarity index 100%
rename from extensions/settings/.dockerignore
rename to services/settings/.dockerignore
diff --git a/extensions/settings/.eslintrc.json b/services/settings/.eslintrc.json
similarity index 100%
rename from extensions/settings/.eslintrc.json
rename to services/settings/.eslintrc.json
diff --git a/extensions/settings/.gitignore b/services/settings/.gitignore
similarity index 100%
rename from extensions/settings/.gitignore
rename to services/settings/.gitignore
diff --git a/extensions/settings/.golangci.yml b/services/settings/.golangci.yml
similarity index 100%
rename from extensions/settings/.golangci.yml
rename to services/settings/.golangci.yml
diff --git a/extensions/settings/.yarn/releases/yarn-stable-temp.cjs b/services/settings/.yarn/releases/yarn-stable-temp.cjs
similarity index 100%
rename from extensions/settings/.yarn/releases/yarn-stable-temp.cjs
rename to services/settings/.yarn/releases/yarn-stable-temp.cjs
diff --git a/extensions/settings/Makefile b/services/settings/Makefile
similarity index 100%
rename from extensions/settings/Makefile
rename to services/settings/Makefile
diff --git a/extensions/settings/assets/.keep b/services/settings/assets/.keep
similarity index 100%
rename from extensions/settings/assets/.keep
rename to services/settings/assets/.keep
diff --git a/extensions/settings/babel.config.js b/services/settings/babel.config.js
similarity index 100%
rename from extensions/settings/babel.config.js
rename to services/settings/babel.config.js
diff --git a/extensions/settings/cmd/settings/main.go b/services/settings/cmd/settings/main.go
similarity index 100%
rename from extensions/settings/cmd/settings/main.go
rename to services/settings/cmd/settings/main.go
diff --git a/extensions/settings/docker/Dockerfile.linux.amd64 b/services/settings/docker/Dockerfile.linux.amd64
similarity index 100%
rename from extensions/settings/docker/Dockerfile.linux.amd64
rename to services/settings/docker/Dockerfile.linux.amd64
diff --git a/extensions/settings/docker/Dockerfile.linux.arm b/services/settings/docker/Dockerfile.linux.arm
similarity index 100%
rename from extensions/settings/docker/Dockerfile.linux.arm
rename to services/settings/docker/Dockerfile.linux.arm
diff --git a/extensions/settings/docker/Dockerfile.linux.arm64 b/services/settings/docker/Dockerfile.linux.arm64
similarity index 100%
rename from extensions/settings/docker/Dockerfile.linux.arm64
rename to services/settings/docker/Dockerfile.linux.arm64
diff --git a/extensions/settings/docker/manifest.tmpl b/services/settings/docker/manifest.tmpl
similarity index 100%
rename from extensions/settings/docker/manifest.tmpl
rename to services/settings/docker/manifest.tmpl
diff --git a/extensions/settings/l10n/.tx/config b/services/settings/l10n/.tx/config
similarity index 100%
rename from extensions/settings/l10n/.tx/config
rename to services/settings/l10n/.tx/config
diff --git a/extensions/settings/l10n/translations.json b/services/settings/l10n/translations.json
similarity index 100%
rename from extensions/settings/l10n/translations.json
rename to services/settings/l10n/translations.json
diff --git a/extensions/settings/nightwatch.conf.js b/services/settings/nightwatch.conf.js
similarity index 100%
rename from extensions/settings/nightwatch.conf.js
rename to services/settings/nightwatch.conf.js
diff --git a/extensions/settings/package.json b/services/settings/package.json
similarity index 100%
rename from extensions/settings/package.json
rename to services/settings/package.json
diff --git a/extensions/settings/pkg/assets/option.go b/services/settings/pkg/assets/option.go
similarity index 100%
rename from extensions/settings/pkg/assets/option.go
rename to services/settings/pkg/assets/option.go
diff --git a/extensions/settings/pkg/command/health.go b/services/settings/pkg/command/health.go
similarity index 100%
rename from extensions/settings/pkg/command/health.go
rename to services/settings/pkg/command/health.go
diff --git a/extensions/settings/pkg/command/root.go b/services/settings/pkg/command/root.go
similarity index 100%
rename from extensions/settings/pkg/command/root.go
rename to services/settings/pkg/command/root.go
diff --git a/extensions/settings/pkg/command/server.go b/services/settings/pkg/command/server.go
similarity index 100%
rename from extensions/settings/pkg/command/server.go
rename to services/settings/pkg/command/server.go
diff --git a/extensions/settings/pkg/command/version.go b/services/settings/pkg/command/version.go
similarity index 100%
rename from extensions/settings/pkg/command/version.go
rename to services/settings/pkg/command/version.go
diff --git a/extensions/settings/pkg/config/config.go b/services/settings/pkg/config/config.go
similarity index 100%
rename from extensions/settings/pkg/config/config.go
rename to services/settings/pkg/config/config.go
diff --git a/extensions/settings/pkg/config/debug.go b/services/settings/pkg/config/debug.go
similarity index 100%
rename from extensions/settings/pkg/config/debug.go
rename to services/settings/pkg/config/debug.go
diff --git a/extensions/settings/pkg/config/defaults/defaultconfig.go b/services/settings/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/settings/pkg/config/defaults/defaultconfig.go
rename to services/settings/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/settings/pkg/config/grpc.go b/services/settings/pkg/config/grpc.go
similarity index 100%
rename from extensions/settings/pkg/config/grpc.go
rename to services/settings/pkg/config/grpc.go
diff --git a/extensions/settings/pkg/config/http.go b/services/settings/pkg/config/http.go
similarity index 100%
rename from extensions/settings/pkg/config/http.go
rename to services/settings/pkg/config/http.go
diff --git a/extensions/settings/pkg/config/log.go b/services/settings/pkg/config/log.go
similarity index 100%
rename from extensions/settings/pkg/config/log.go
rename to services/settings/pkg/config/log.go
diff --git a/extensions/settings/pkg/config/parser/parse.go b/services/settings/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/settings/pkg/config/parser/parse.go
rename to services/settings/pkg/config/parser/parse.go
diff --git a/extensions/settings/pkg/config/reva.go b/services/settings/pkg/config/reva.go
similarity index 100%
rename from extensions/settings/pkg/config/reva.go
rename to services/settings/pkg/config/reva.go
diff --git a/extensions/settings/pkg/config/service.go b/services/settings/pkg/config/service.go
similarity index 100%
rename from extensions/settings/pkg/config/service.go
rename to services/settings/pkg/config/service.go
diff --git a/extensions/settings/pkg/config/tracing.go b/services/settings/pkg/config/tracing.go
similarity index 100%
rename from extensions/settings/pkg/config/tracing.go
rename to services/settings/pkg/config/tracing.go
diff --git a/extensions/settings/pkg/logging/logging.go b/services/settings/pkg/logging/logging.go
similarity index 100%
rename from extensions/settings/pkg/logging/logging.go
rename to services/settings/pkg/logging/logging.go
diff --git a/extensions/settings/pkg/metrics/metrics.go b/services/settings/pkg/metrics/metrics.go
similarity index 100%
rename from extensions/settings/pkg/metrics/metrics.go
rename to services/settings/pkg/metrics/metrics.go
diff --git a/extensions/settings/pkg/server/debug/option.go b/services/settings/pkg/server/debug/option.go
similarity index 100%
rename from extensions/settings/pkg/server/debug/option.go
rename to services/settings/pkg/server/debug/option.go
diff --git a/extensions/settings/pkg/server/debug/server.go b/services/settings/pkg/server/debug/server.go
similarity index 100%
rename from extensions/settings/pkg/server/debug/server.go
rename to services/settings/pkg/server/debug/server.go
diff --git a/extensions/settings/pkg/server/grpc/option.go b/services/settings/pkg/server/grpc/option.go
similarity index 100%
rename from extensions/settings/pkg/server/grpc/option.go
rename to services/settings/pkg/server/grpc/option.go
diff --git a/extensions/settings/pkg/server/grpc/server.go b/services/settings/pkg/server/grpc/server.go
similarity index 100%
rename from extensions/settings/pkg/server/grpc/server.go
rename to services/settings/pkg/server/grpc/server.go
diff --git a/extensions/settings/pkg/server/http/option.go b/services/settings/pkg/server/http/option.go
similarity index 100%
rename from extensions/settings/pkg/server/http/option.go
rename to services/settings/pkg/server/http/option.go
diff --git a/extensions/settings/pkg/server/http/server.go b/services/settings/pkg/server/http/server.go
similarity index 100%
rename from extensions/settings/pkg/server/http/server.go
rename to services/settings/pkg/server/http/server.go
diff --git a/extensions/settings/pkg/service/v0/instrument.go b/services/settings/pkg/service/v0/instrument.go
similarity index 100%
rename from extensions/settings/pkg/service/v0/instrument.go
rename to services/settings/pkg/service/v0/instrument.go
diff --git a/extensions/settings/pkg/service/v0/logging.go b/services/settings/pkg/service/v0/logging.go
similarity index 100%
rename from extensions/settings/pkg/service/v0/logging.go
rename to services/settings/pkg/service/v0/logging.go
diff --git a/extensions/settings/pkg/service/v0/option.go b/services/settings/pkg/service/v0/option.go
similarity index 100%
rename from extensions/settings/pkg/service/v0/option.go
rename to services/settings/pkg/service/v0/option.go
diff --git a/extensions/settings/pkg/service/v0/permissions.go b/services/settings/pkg/service/v0/permissions.go
similarity index 100%
rename from extensions/settings/pkg/service/v0/permissions.go
rename to services/settings/pkg/service/v0/permissions.go
diff --git a/extensions/settings/pkg/service/v0/service.go b/services/settings/pkg/service/v0/service.go
similarity index 100%
rename from extensions/settings/pkg/service/v0/service.go
rename to services/settings/pkg/service/v0/service.go
diff --git a/extensions/settings/pkg/service/v0/service_test.go b/services/settings/pkg/service/v0/service_test.go
similarity index 100%
rename from extensions/settings/pkg/service/v0/service_test.go
rename to services/settings/pkg/service/v0/service_test.go
diff --git a/extensions/settings/pkg/service/v0/settings.go b/services/settings/pkg/service/v0/settings.go
similarity index 100%
rename from extensions/settings/pkg/service/v0/settings.go
rename to services/settings/pkg/service/v0/settings.go
diff --git a/extensions/settings/pkg/service/v0/tracing.go b/services/settings/pkg/service/v0/tracing.go
similarity index 100%
rename from extensions/settings/pkg/service/v0/tracing.go
rename to services/settings/pkg/service/v0/tracing.go
diff --git a/extensions/settings/pkg/service/v0/validator.go b/services/settings/pkg/service/v0/validator.go
similarity index 100%
rename from extensions/settings/pkg/service/v0/validator.go
rename to services/settings/pkg/service/v0/validator.go
diff --git a/extensions/settings/pkg/settings/settings.go b/services/settings/pkg/settings/settings.go
similarity index 100%
rename from extensions/settings/pkg/settings/settings.go
rename to services/settings/pkg/settings/settings.go
diff --git a/extensions/settings/pkg/store/defaults/defaults.go b/services/settings/pkg/store/defaults/defaults.go
similarity index 100%
rename from extensions/settings/pkg/store/defaults/defaults.go
rename to services/settings/pkg/store/defaults/defaults.go
diff --git a/extensions/settings/pkg/store/errortypes/errortypes.go b/services/settings/pkg/store/errortypes/errortypes.go
similarity index 100%
rename from extensions/settings/pkg/store/errortypes/errortypes.go
rename to services/settings/pkg/store/errortypes/errortypes.go
diff --git a/extensions/settings/pkg/store/filesystem/assignments.go b/services/settings/pkg/store/filesystem/assignments.go
similarity index 100%
rename from extensions/settings/pkg/store/filesystem/assignments.go
rename to services/settings/pkg/store/filesystem/assignments.go
diff --git a/extensions/settings/pkg/store/filesystem/assignments_test.go b/services/settings/pkg/store/filesystem/assignments_test.go
similarity index 100%
rename from extensions/settings/pkg/store/filesystem/assignments_test.go
rename to services/settings/pkg/store/filesystem/assignments_test.go
diff --git a/extensions/settings/pkg/store/filesystem/bundles.go b/services/settings/pkg/store/filesystem/bundles.go
similarity index 100%
rename from extensions/settings/pkg/store/filesystem/bundles.go
rename to services/settings/pkg/store/filesystem/bundles.go
diff --git a/extensions/settings/pkg/store/filesystem/bundles_test.go b/services/settings/pkg/store/filesystem/bundles_test.go
similarity index 100%
rename from extensions/settings/pkg/store/filesystem/bundles_test.go
rename to services/settings/pkg/store/filesystem/bundles_test.go
diff --git a/extensions/settings/pkg/store/filesystem/io.go b/services/settings/pkg/store/filesystem/io.go
similarity index 100%
rename from extensions/settings/pkg/store/filesystem/io.go
rename to services/settings/pkg/store/filesystem/io.go
diff --git a/extensions/settings/pkg/store/filesystem/paths.go b/services/settings/pkg/store/filesystem/paths.go
similarity index 100%
rename from extensions/settings/pkg/store/filesystem/paths.go
rename to services/settings/pkg/store/filesystem/paths.go
diff --git a/extensions/settings/pkg/store/filesystem/permissions.go b/services/settings/pkg/store/filesystem/permissions.go
similarity index 100%
rename from extensions/settings/pkg/store/filesystem/permissions.go
rename to services/settings/pkg/store/filesystem/permissions.go
diff --git a/extensions/settings/pkg/store/filesystem/staticcheck.conf b/services/settings/pkg/store/filesystem/staticcheck.conf
similarity index 100%
rename from extensions/settings/pkg/store/filesystem/staticcheck.conf
rename to services/settings/pkg/store/filesystem/staticcheck.conf
diff --git a/extensions/settings/pkg/store/filesystem/store.go b/services/settings/pkg/store/filesystem/store.go
similarity index 100%
rename from extensions/settings/pkg/store/filesystem/store.go
rename to services/settings/pkg/store/filesystem/store.go
diff --git a/extensions/settings/pkg/store/filesystem/store_test.go b/services/settings/pkg/store/filesystem/store_test.go
similarity index 100%
rename from extensions/settings/pkg/store/filesystem/store_test.go
rename to services/settings/pkg/store/filesystem/store_test.go
diff --git a/extensions/settings/pkg/store/filesystem/values.go b/services/settings/pkg/store/filesystem/values.go
similarity index 100%
rename from extensions/settings/pkg/store/filesystem/values.go
rename to services/settings/pkg/store/filesystem/values.go
diff --git a/extensions/settings/pkg/store/filesystem/values_test.go b/services/settings/pkg/store/filesystem/values_test.go
similarity index 100%
rename from extensions/settings/pkg/store/filesystem/values_test.go
rename to services/settings/pkg/store/filesystem/values_test.go
diff --git a/extensions/settings/pkg/store/metadata/assignments.go b/services/settings/pkg/store/metadata/assignments.go
similarity index 100%
rename from extensions/settings/pkg/store/metadata/assignments.go
rename to services/settings/pkg/store/metadata/assignments.go
diff --git a/extensions/settings/pkg/store/metadata/assignments_test.go b/services/settings/pkg/store/metadata/assignments_test.go
similarity index 100%
rename from extensions/settings/pkg/store/metadata/assignments_test.go
rename to services/settings/pkg/store/metadata/assignments_test.go
diff --git a/extensions/settings/pkg/store/metadata/bundles.go b/services/settings/pkg/store/metadata/bundles.go
similarity index 100%
rename from extensions/settings/pkg/store/metadata/bundles.go
rename to services/settings/pkg/store/metadata/bundles.go
diff --git a/extensions/settings/pkg/store/metadata/bundles_test.go b/services/settings/pkg/store/metadata/bundles_test.go
similarity index 100%
rename from extensions/settings/pkg/store/metadata/bundles_test.go
rename to services/settings/pkg/store/metadata/bundles_test.go
diff --git a/extensions/settings/pkg/store/metadata/cache.go b/services/settings/pkg/store/metadata/cache.go
similarity index 100%
rename from extensions/settings/pkg/store/metadata/cache.go
rename to services/settings/pkg/store/metadata/cache.go
diff --git a/extensions/settings/pkg/store/metadata/permissions.go b/services/settings/pkg/store/metadata/permissions.go
similarity index 100%
rename from extensions/settings/pkg/store/metadata/permissions.go
rename to services/settings/pkg/store/metadata/permissions.go
diff --git a/extensions/settings/pkg/store/metadata/permissions_test.go b/services/settings/pkg/store/metadata/permissions_test.go
similarity index 100%
rename from extensions/settings/pkg/store/metadata/permissions_test.go
rename to services/settings/pkg/store/metadata/permissions_test.go
diff --git a/extensions/settings/pkg/store/metadata/store.go b/services/settings/pkg/store/metadata/store.go
similarity index 100%
rename from extensions/settings/pkg/store/metadata/store.go
rename to services/settings/pkg/store/metadata/store.go
diff --git a/extensions/settings/pkg/store/metadata/store_test.go b/services/settings/pkg/store/metadata/store_test.go
similarity index 100%
rename from extensions/settings/pkg/store/metadata/store_test.go
rename to services/settings/pkg/store/metadata/store_test.go
diff --git a/extensions/settings/pkg/store/metadata/values.go b/services/settings/pkg/store/metadata/values.go
similarity index 100%
rename from extensions/settings/pkg/store/metadata/values.go
rename to services/settings/pkg/store/metadata/values.go
diff --git a/extensions/settings/pkg/store/metadata/values_test.go b/services/settings/pkg/store/metadata/values_test.go
similarity index 100%
rename from extensions/settings/pkg/store/metadata/values_test.go
rename to services/settings/pkg/store/metadata/values_test.go
diff --git a/extensions/settings/pkg/store/registry.go b/services/settings/pkg/store/registry.go
similarity index 100%
rename from extensions/settings/pkg/store/registry.go
rename to services/settings/pkg/store/registry.go
diff --git a/extensions/settings/pkg/tracing/tracing.go b/services/settings/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/settings/pkg/tracing/tracing.go
rename to services/settings/pkg/tracing/tracing.go
diff --git a/extensions/settings/pkg/util/resource_helper.go b/services/settings/pkg/util/resource_helper.go
similarity index 100%
rename from extensions/settings/pkg/util/resource_helper.go
rename to services/settings/pkg/util/resource_helper.go
diff --git a/extensions/settings/pkg/util/resource_helper_test.go b/services/settings/pkg/util/resource_helper_test.go
similarity index 100%
rename from extensions/settings/pkg/util/resource_helper_test.go
rename to services/settings/pkg/util/resource_helper_test.go
diff --git a/extensions/settings/reflex.conf b/services/settings/reflex.conf
similarity index 100%
rename from extensions/settings/reflex.conf
rename to services/settings/reflex.conf
diff --git a/extensions/settings/rollup.config.js b/services/settings/rollup.config.js
similarity index 100%
rename from extensions/settings/rollup.config.js
rename to services/settings/rollup.config.js
diff --git a/extensions/settings/settings.go b/services/settings/settings.go
similarity index 100%
rename from extensions/settings/settings.go
rename to services/settings/settings.go
diff --git a/extensions/settings/ui/app.js b/services/settings/ui/app.js
similarity index 100%
rename from extensions/settings/ui/app.js
rename to services/settings/ui/app.js
diff --git a/extensions/settings/ui/client/settings/index.js b/services/settings/ui/client/settings/index.js
similarity index 100%
rename from extensions/settings/ui/client/settings/index.js
rename to services/settings/ui/client/settings/index.js
diff --git a/extensions/settings/ui/components/SettingsApp.vue b/services/settings/ui/components/SettingsApp.vue
similarity index 100%
rename from extensions/settings/ui/components/SettingsApp.vue
rename to services/settings/ui/components/SettingsApp.vue
diff --git a/extensions/settings/ui/components/SettingsBundle.vue b/services/settings/ui/components/SettingsBundle.vue
similarity index 100%
rename from extensions/settings/ui/components/SettingsBundle.vue
rename to services/settings/ui/components/SettingsBundle.vue
diff --git a/extensions/settings/ui/components/settings/SettingBoolean.vue b/services/settings/ui/components/settings/SettingBoolean.vue
similarity index 100%
rename from extensions/settings/ui/components/settings/SettingBoolean.vue
rename to services/settings/ui/components/settings/SettingBoolean.vue
diff --git a/extensions/settings/ui/components/settings/SettingMultiChoice.vue b/services/settings/ui/components/settings/SettingMultiChoice.vue
similarity index 100%
rename from extensions/settings/ui/components/settings/SettingMultiChoice.vue
rename to services/settings/ui/components/settings/SettingMultiChoice.vue
diff --git a/extensions/settings/ui/components/settings/SettingNumber.vue b/services/settings/ui/components/settings/SettingNumber.vue
similarity index 100%
rename from extensions/settings/ui/components/settings/SettingNumber.vue
rename to services/settings/ui/components/settings/SettingNumber.vue
diff --git a/extensions/settings/ui/components/settings/SettingSingleChoice.vue b/services/settings/ui/components/settings/SettingSingleChoice.vue
similarity index 100%
rename from extensions/settings/ui/components/settings/SettingSingleChoice.vue
rename to services/settings/ui/components/settings/SettingSingleChoice.vue
diff --git a/extensions/settings/ui/components/settings/SettingString.vue b/services/settings/ui/components/settings/SettingString.vue
similarity index 100%
rename from extensions/settings/ui/components/settings/SettingString.vue
rename to services/settings/ui/components/settings/SettingString.vue
diff --git a/extensions/settings/ui/components/settings/SettingUnknown.vue b/services/settings/ui/components/settings/SettingUnknown.vue
similarity index 100%
rename from extensions/settings/ui/components/settings/SettingUnknown.vue
rename to services/settings/ui/components/settings/SettingUnknown.vue
diff --git a/extensions/settings/ui/dictionary.js b/services/settings/ui/dictionary.js
similarity index 100%
rename from extensions/settings/ui/dictionary.js
rename to services/settings/ui/dictionary.js
diff --git a/extensions/settings/ui/store/index.js b/services/settings/ui/store/index.js
similarity index 100%
rename from extensions/settings/ui/store/index.js
rename to services/settings/ui/store/index.js
diff --git a/extensions/settings/ui/tests/acceptance/features/settings.feature b/services/settings/ui/tests/acceptance/features/settings.feature
similarity index 100%
rename from extensions/settings/ui/tests/acceptance/features/settings.feature
rename to services/settings/ui/tests/acceptance/features/settings.feature
diff --git a/extensions/settings/ui/tests/acceptance/helpers/language.js b/services/settings/ui/tests/acceptance/helpers/language.js
similarity index 100%
rename from extensions/settings/ui/tests/acceptance/helpers/language.js
rename to services/settings/ui/tests/acceptance/helpers/language.js
diff --git a/extensions/settings/ui/tests/acceptance/pageobjects/filesPageSettingsContext.js b/services/settings/ui/tests/acceptance/pageobjects/filesPageSettingsContext.js
similarity index 100%
rename from extensions/settings/ui/tests/acceptance/pageobjects/filesPageSettingsContext.js
rename to services/settings/ui/tests/acceptance/pageobjects/filesPageSettingsContext.js
diff --git a/extensions/settings/ui/tests/acceptance/pageobjects/settingsPage.js b/services/settings/ui/tests/acceptance/pageobjects/settingsPage.js
similarity index 100%
rename from extensions/settings/ui/tests/acceptance/pageobjects/settingsPage.js
rename to services/settings/ui/tests/acceptance/pageobjects/settingsPage.js
diff --git a/extensions/settings/ui/tests/acceptance/stepDefinitions/settingsContext.js b/services/settings/ui/tests/acceptance/stepDefinitions/settingsContext.js
similarity index 100%
rename from extensions/settings/ui/tests/acceptance/stepDefinitions/settingsContext.js
rename to services/settings/ui/tests/acceptance/stepDefinitions/settingsContext.js
diff --git a/extensions/settings/ui/tests/run-acceptance-test.sh b/services/settings/ui/tests/run-acceptance-test.sh
similarity index 100%
rename from extensions/settings/ui/tests/run-acceptance-test.sh
rename to services/settings/ui/tests/run-acceptance-test.sh
diff --git a/extensions/settings/yarn.lock b/services/settings/yarn.lock
similarity index 100%
rename from extensions/settings/yarn.lock
rename to services/settings/yarn.lock
diff --git a/extensions/sharing/Makefile b/services/sharing/Makefile
similarity index 100%
rename from extensions/sharing/Makefile
rename to services/sharing/Makefile
diff --git a/extensions/sharing/cmd/sharing/main.go b/services/sharing/cmd/sharing/main.go
similarity index 100%
rename from extensions/sharing/cmd/sharing/main.go
rename to services/sharing/cmd/sharing/main.go
diff --git a/extensions/sharing/pkg/command/health.go b/services/sharing/pkg/command/health.go
similarity index 100%
rename from extensions/sharing/pkg/command/health.go
rename to services/sharing/pkg/command/health.go
diff --git a/extensions/sharing/pkg/command/root.go b/services/sharing/pkg/command/root.go
similarity index 100%
rename from extensions/sharing/pkg/command/root.go
rename to services/sharing/pkg/command/root.go
diff --git a/extensions/sharing/pkg/command/server.go b/services/sharing/pkg/command/server.go
similarity index 100%
rename from extensions/sharing/pkg/command/server.go
rename to services/sharing/pkg/command/server.go
diff --git a/extensions/sharing/pkg/command/version.go b/services/sharing/pkg/command/version.go
similarity index 100%
rename from extensions/sharing/pkg/command/version.go
rename to services/sharing/pkg/command/version.go
diff --git a/extensions/sharing/pkg/config/config.go b/services/sharing/pkg/config/config.go
similarity index 100%
rename from extensions/sharing/pkg/config/config.go
rename to services/sharing/pkg/config/config.go
diff --git a/extensions/sharing/pkg/config/defaults/defaultconfig.go b/services/sharing/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/sharing/pkg/config/defaults/defaultconfig.go
rename to services/sharing/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/sharing/pkg/config/parser/parse.go b/services/sharing/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/sharing/pkg/config/parser/parse.go
rename to services/sharing/pkg/config/parser/parse.go
diff --git a/extensions/sharing/pkg/config/reva.go b/services/sharing/pkg/config/reva.go
similarity index 100%
rename from extensions/sharing/pkg/config/reva.go
rename to services/sharing/pkg/config/reva.go
diff --git a/extensions/sharing/pkg/logging/logging.go b/services/sharing/pkg/logging/logging.go
similarity index 100%
rename from extensions/sharing/pkg/logging/logging.go
rename to services/sharing/pkg/logging/logging.go
diff --git a/extensions/sharing/pkg/revaconfig/config.go b/services/sharing/pkg/revaconfig/config.go
similarity index 100%
rename from extensions/sharing/pkg/revaconfig/config.go
rename to services/sharing/pkg/revaconfig/config.go
diff --git a/extensions/sharing/pkg/server/debug/option.go b/services/sharing/pkg/server/debug/option.go
similarity index 100%
rename from extensions/sharing/pkg/server/debug/option.go
rename to services/sharing/pkg/server/debug/option.go
diff --git a/extensions/sharing/pkg/server/debug/server.go b/services/sharing/pkg/server/debug/server.go
similarity index 100%
rename from extensions/sharing/pkg/server/debug/server.go
rename to services/sharing/pkg/server/debug/server.go
diff --git a/extensions/sharing/pkg/tracing/tracing.go b/services/sharing/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/sharing/pkg/tracing/tracing.go
rename to services/sharing/pkg/tracing/tracing.go
diff --git a/extensions/storage-publiclink/Makefile b/services/storage-publiclink/Makefile
similarity index 100%
rename from extensions/storage-publiclink/Makefile
rename to services/storage-publiclink/Makefile
diff --git a/extensions/storage-publiclink/cmd/storage-publiclink/main.go b/services/storage-publiclink/cmd/storage-publiclink/main.go
similarity index 100%
rename from extensions/storage-publiclink/cmd/storage-publiclink/main.go
rename to services/storage-publiclink/cmd/storage-publiclink/main.go
diff --git a/extensions/storage-publiclink/pkg/command/health.go b/services/storage-publiclink/pkg/command/health.go
similarity index 100%
rename from extensions/storage-publiclink/pkg/command/health.go
rename to services/storage-publiclink/pkg/command/health.go
diff --git a/extensions/storage-publiclink/pkg/command/root.go b/services/storage-publiclink/pkg/command/root.go
similarity index 100%
rename from extensions/storage-publiclink/pkg/command/root.go
rename to services/storage-publiclink/pkg/command/root.go
diff --git a/extensions/storage-publiclink/pkg/command/server.go b/services/storage-publiclink/pkg/command/server.go
similarity index 100%
rename from extensions/storage-publiclink/pkg/command/server.go
rename to services/storage-publiclink/pkg/command/server.go
diff --git a/extensions/storage-publiclink/pkg/command/version.go b/services/storage-publiclink/pkg/command/version.go
similarity index 100%
rename from extensions/storage-publiclink/pkg/command/version.go
rename to services/storage-publiclink/pkg/command/version.go
diff --git a/extensions/storage-publiclink/pkg/config/config.go b/services/storage-publiclink/pkg/config/config.go
similarity index 100%
rename from extensions/storage-publiclink/pkg/config/config.go
rename to services/storage-publiclink/pkg/config/config.go
diff --git a/extensions/storage-publiclink/pkg/config/defaults/defaultconfig.go b/services/storage-publiclink/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/storage-publiclink/pkg/config/defaults/defaultconfig.go
rename to services/storage-publiclink/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/storage-publiclink/pkg/config/parser/parse.go b/services/storage-publiclink/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/storage-publiclink/pkg/config/parser/parse.go
rename to services/storage-publiclink/pkg/config/parser/parse.go
diff --git a/extensions/storage-publiclink/pkg/config/reva.go b/services/storage-publiclink/pkg/config/reva.go
similarity index 100%
rename from extensions/storage-publiclink/pkg/config/reva.go
rename to services/storage-publiclink/pkg/config/reva.go
diff --git a/extensions/storage-publiclink/pkg/logging/logging.go b/services/storage-publiclink/pkg/logging/logging.go
similarity index 100%
rename from extensions/storage-publiclink/pkg/logging/logging.go
rename to services/storage-publiclink/pkg/logging/logging.go
diff --git a/extensions/storage-publiclink/pkg/revaconfig/config.go b/services/storage-publiclink/pkg/revaconfig/config.go
similarity index 100%
rename from extensions/storage-publiclink/pkg/revaconfig/config.go
rename to services/storage-publiclink/pkg/revaconfig/config.go
diff --git a/extensions/storage-publiclink/pkg/server/debug/option.go b/services/storage-publiclink/pkg/server/debug/option.go
similarity index 100%
rename from extensions/storage-publiclink/pkg/server/debug/option.go
rename to services/storage-publiclink/pkg/server/debug/option.go
diff --git a/extensions/storage-publiclink/pkg/server/debug/server.go b/services/storage-publiclink/pkg/server/debug/server.go
similarity index 100%
rename from extensions/storage-publiclink/pkg/server/debug/server.go
rename to services/storage-publiclink/pkg/server/debug/server.go
diff --git a/extensions/storage-publiclink/pkg/tracing/tracing.go b/services/storage-publiclink/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/storage-publiclink/pkg/tracing/tracing.go
rename to services/storage-publiclink/pkg/tracing/tracing.go
diff --git a/extensions/storage-shares/Makefile b/services/storage-shares/Makefile
similarity index 100%
rename from extensions/storage-shares/Makefile
rename to services/storage-shares/Makefile
diff --git a/extensions/storage-shares/cmd/storage-shares/main.go b/services/storage-shares/cmd/storage-shares/main.go
similarity index 100%
rename from extensions/storage-shares/cmd/storage-shares/main.go
rename to services/storage-shares/cmd/storage-shares/main.go
diff --git a/extensions/storage-shares/pkg/command/health.go b/services/storage-shares/pkg/command/health.go
similarity index 100%
rename from extensions/storage-shares/pkg/command/health.go
rename to services/storage-shares/pkg/command/health.go
diff --git a/extensions/storage-shares/pkg/command/root.go b/services/storage-shares/pkg/command/root.go
similarity index 100%
rename from extensions/storage-shares/pkg/command/root.go
rename to services/storage-shares/pkg/command/root.go
diff --git a/extensions/storage-shares/pkg/command/server.go b/services/storage-shares/pkg/command/server.go
similarity index 100%
rename from extensions/storage-shares/pkg/command/server.go
rename to services/storage-shares/pkg/command/server.go
diff --git a/extensions/storage-shares/pkg/command/version.go b/services/storage-shares/pkg/command/version.go
similarity index 100%
rename from extensions/storage-shares/pkg/command/version.go
rename to services/storage-shares/pkg/command/version.go
diff --git a/extensions/storage-shares/pkg/config/config.go b/services/storage-shares/pkg/config/config.go
similarity index 100%
rename from extensions/storage-shares/pkg/config/config.go
rename to services/storage-shares/pkg/config/config.go
diff --git a/extensions/storage-shares/pkg/config/defaults/defaultconfig.go b/services/storage-shares/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/storage-shares/pkg/config/defaults/defaultconfig.go
rename to services/storage-shares/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/storage-shares/pkg/config/parser/parse.go b/services/storage-shares/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/storage-shares/pkg/config/parser/parse.go
rename to services/storage-shares/pkg/config/parser/parse.go
diff --git a/extensions/storage-shares/pkg/config/reva.go b/services/storage-shares/pkg/config/reva.go
similarity index 100%
rename from extensions/storage-shares/pkg/config/reva.go
rename to services/storage-shares/pkg/config/reva.go
diff --git a/extensions/storage-shares/pkg/logging/logging.go b/services/storage-shares/pkg/logging/logging.go
similarity index 100%
rename from extensions/storage-shares/pkg/logging/logging.go
rename to services/storage-shares/pkg/logging/logging.go
diff --git a/extensions/storage-shares/pkg/revaconfig/config.go b/services/storage-shares/pkg/revaconfig/config.go
similarity index 100%
rename from extensions/storage-shares/pkg/revaconfig/config.go
rename to services/storage-shares/pkg/revaconfig/config.go
diff --git a/extensions/storage-shares/pkg/server/debug/option.go b/services/storage-shares/pkg/server/debug/option.go
similarity index 100%
rename from extensions/storage-shares/pkg/server/debug/option.go
rename to services/storage-shares/pkg/server/debug/option.go
diff --git a/extensions/storage-shares/pkg/server/debug/server.go b/services/storage-shares/pkg/server/debug/server.go
similarity index 100%
rename from extensions/storage-shares/pkg/server/debug/server.go
rename to services/storage-shares/pkg/server/debug/server.go
diff --git a/extensions/storage-shares/pkg/tracing/tracing.go b/services/storage-shares/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/storage-shares/pkg/tracing/tracing.go
rename to services/storage-shares/pkg/tracing/tracing.go
diff --git a/extensions/storage-system/Makefile b/services/storage-system/Makefile
similarity index 100%
rename from extensions/storage-system/Makefile
rename to services/storage-system/Makefile
diff --git a/extensions/storage-system/cmd/storage-system/main.go b/services/storage-system/cmd/storage-system/main.go
similarity index 100%
rename from extensions/storage-system/cmd/storage-system/main.go
rename to services/storage-system/cmd/storage-system/main.go
diff --git a/extensions/storage-system/pkg/command/health.go b/services/storage-system/pkg/command/health.go
similarity index 100%
rename from extensions/storage-system/pkg/command/health.go
rename to services/storage-system/pkg/command/health.go
diff --git a/extensions/storage-system/pkg/command/root.go b/services/storage-system/pkg/command/root.go
similarity index 100%
rename from extensions/storage-system/pkg/command/root.go
rename to services/storage-system/pkg/command/root.go
diff --git a/extensions/storage-system/pkg/command/server.go b/services/storage-system/pkg/command/server.go
similarity index 100%
rename from extensions/storage-system/pkg/command/server.go
rename to services/storage-system/pkg/command/server.go
diff --git a/extensions/storage-system/pkg/command/version.go b/services/storage-system/pkg/command/version.go
similarity index 100%
rename from extensions/storage-system/pkg/command/version.go
rename to services/storage-system/pkg/command/version.go
diff --git a/extensions/storage-system/pkg/config/config.go b/services/storage-system/pkg/config/config.go
similarity index 100%
rename from extensions/storage-system/pkg/config/config.go
rename to services/storage-system/pkg/config/config.go
diff --git a/extensions/storage-system/pkg/config/defaults/defaultconfig.go b/services/storage-system/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/storage-system/pkg/config/defaults/defaultconfig.go
rename to services/storage-system/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/storage-system/pkg/config/parser/parse.go b/services/storage-system/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/storage-system/pkg/config/parser/parse.go
rename to services/storage-system/pkg/config/parser/parse.go
diff --git a/extensions/storage-system/pkg/config/reva.go b/services/storage-system/pkg/config/reva.go
similarity index 100%
rename from extensions/storage-system/pkg/config/reva.go
rename to services/storage-system/pkg/config/reva.go
diff --git a/extensions/storage-system/pkg/logging/logging.go b/services/storage-system/pkg/logging/logging.go
similarity index 100%
rename from extensions/storage-system/pkg/logging/logging.go
rename to services/storage-system/pkg/logging/logging.go
diff --git a/extensions/storage-system/pkg/revaconfig/config.go b/services/storage-system/pkg/revaconfig/config.go
similarity index 100%
rename from extensions/storage-system/pkg/revaconfig/config.go
rename to services/storage-system/pkg/revaconfig/config.go
diff --git a/extensions/storage-system/pkg/server/debug/option.go b/services/storage-system/pkg/server/debug/option.go
similarity index 100%
rename from extensions/storage-system/pkg/server/debug/option.go
rename to services/storage-system/pkg/server/debug/option.go
diff --git a/extensions/storage-system/pkg/server/debug/server.go b/services/storage-system/pkg/server/debug/server.go
similarity index 100%
rename from extensions/storage-system/pkg/server/debug/server.go
rename to services/storage-system/pkg/server/debug/server.go
diff --git a/extensions/storage-system/pkg/tracing/tracing.go b/services/storage-system/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/storage-system/pkg/tracing/tracing.go
rename to services/storage-system/pkg/tracing/tracing.go
diff --git a/extensions/storage-users/Makefile b/services/storage-users/Makefile
similarity index 100%
rename from extensions/storage-users/Makefile
rename to services/storage-users/Makefile
diff --git a/extensions/storage-users/cmd/storage-users/main.go b/services/storage-users/cmd/storage-users/main.go
similarity index 100%
rename from extensions/storage-users/cmd/storage-users/main.go
rename to services/storage-users/cmd/storage-users/main.go
diff --git a/extensions/storage-users/pkg/command/health.go b/services/storage-users/pkg/command/health.go
similarity index 100%
rename from extensions/storage-users/pkg/command/health.go
rename to services/storage-users/pkg/command/health.go
diff --git a/extensions/storage-users/pkg/command/root.go b/services/storage-users/pkg/command/root.go
similarity index 100%
rename from extensions/storage-users/pkg/command/root.go
rename to services/storage-users/pkg/command/root.go
diff --git a/extensions/storage-users/pkg/command/server.go b/services/storage-users/pkg/command/server.go
similarity index 100%
rename from extensions/storage-users/pkg/command/server.go
rename to services/storage-users/pkg/command/server.go
diff --git a/extensions/storage-users/pkg/command/version.go b/services/storage-users/pkg/command/version.go
similarity index 100%
rename from extensions/storage-users/pkg/command/version.go
rename to services/storage-users/pkg/command/version.go
diff --git a/extensions/storage-users/pkg/config/config.go b/services/storage-users/pkg/config/config.go
similarity index 100%
rename from extensions/storage-users/pkg/config/config.go
rename to services/storage-users/pkg/config/config.go
diff --git a/extensions/storage-users/pkg/config/defaults/defaultconfig.go b/services/storage-users/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/storage-users/pkg/config/defaults/defaultconfig.go
rename to services/storage-users/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/storage-users/pkg/config/parser/parse.go b/services/storage-users/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/storage-users/pkg/config/parser/parse.go
rename to services/storage-users/pkg/config/parser/parse.go
diff --git a/extensions/storage-users/pkg/config/reva.go b/services/storage-users/pkg/config/reva.go
similarity index 100%
rename from extensions/storage-users/pkg/config/reva.go
rename to services/storage-users/pkg/config/reva.go
diff --git a/extensions/storage-users/pkg/logging/logging.go b/services/storage-users/pkg/logging/logging.go
similarity index 100%
rename from extensions/storage-users/pkg/logging/logging.go
rename to services/storage-users/pkg/logging/logging.go
diff --git a/extensions/storage-users/pkg/revaconfig/config.go b/services/storage-users/pkg/revaconfig/config.go
similarity index 100%
rename from extensions/storage-users/pkg/revaconfig/config.go
rename to services/storage-users/pkg/revaconfig/config.go
diff --git a/extensions/storage-users/pkg/revaconfig/user.go b/services/storage-users/pkg/revaconfig/user.go
similarity index 100%
rename from extensions/storage-users/pkg/revaconfig/user.go
rename to services/storage-users/pkg/revaconfig/user.go
diff --git a/extensions/storage-users/pkg/server/debug/option.go b/services/storage-users/pkg/server/debug/option.go
similarity index 100%
rename from extensions/storage-users/pkg/server/debug/option.go
rename to services/storage-users/pkg/server/debug/option.go
diff --git a/extensions/storage-users/pkg/server/debug/server.go b/services/storage-users/pkg/server/debug/server.go
similarity index 100%
rename from extensions/storage-users/pkg/server/debug/server.go
rename to services/storage-users/pkg/server/debug/server.go
diff --git a/extensions/storage-users/pkg/tracing/tracing.go b/services/storage-users/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/storage-users/pkg/tracing/tracing.go
rename to services/storage-users/pkg/tracing/tracing.go
diff --git a/extensions/store/.golangci.yaml b/services/store/.golangci.yaml
similarity index 100%
rename from extensions/store/.golangci.yaml
rename to services/store/.golangci.yaml
diff --git a/extensions/store/Makefile b/services/store/Makefile
similarity index 100%
rename from extensions/store/Makefile
rename to services/store/Makefile
diff --git a/extensions/store/cmd/store/main.go b/services/store/cmd/store/main.go
similarity index 100%
rename from extensions/store/cmd/store/main.go
rename to services/store/cmd/store/main.go
diff --git a/extensions/store/docker/Dockerfile.linux.amd64 b/services/store/docker/Dockerfile.linux.amd64
similarity index 100%
rename from extensions/store/docker/Dockerfile.linux.amd64
rename to services/store/docker/Dockerfile.linux.amd64
diff --git a/extensions/store/docker/Dockerfile.linux.arm b/services/store/docker/Dockerfile.linux.arm
similarity index 100%
rename from extensions/store/docker/Dockerfile.linux.arm
rename to services/store/docker/Dockerfile.linux.arm
diff --git a/extensions/store/docker/Dockerfile.linux.arm64 b/services/store/docker/Dockerfile.linux.arm64
similarity index 100%
rename from extensions/store/docker/Dockerfile.linux.arm64
rename to services/store/docker/Dockerfile.linux.arm64
diff --git a/extensions/store/docker/manifest.tmpl b/services/store/docker/manifest.tmpl
similarity index 100%
rename from extensions/store/docker/manifest.tmpl
rename to services/store/docker/manifest.tmpl
diff --git a/extensions/store/pkg/command/health.go b/services/store/pkg/command/health.go
similarity index 100%
rename from extensions/store/pkg/command/health.go
rename to services/store/pkg/command/health.go
diff --git a/extensions/store/pkg/command/root.go b/services/store/pkg/command/root.go
similarity index 100%
rename from extensions/store/pkg/command/root.go
rename to services/store/pkg/command/root.go
diff --git a/extensions/store/pkg/command/server.go b/services/store/pkg/command/server.go
similarity index 100%
rename from extensions/store/pkg/command/server.go
rename to services/store/pkg/command/server.go
diff --git a/extensions/store/pkg/command/version.go b/services/store/pkg/command/version.go
similarity index 100%
rename from extensions/store/pkg/command/version.go
rename to services/store/pkg/command/version.go
diff --git a/extensions/store/pkg/config/config.go b/services/store/pkg/config/config.go
similarity index 100%
rename from extensions/store/pkg/config/config.go
rename to services/store/pkg/config/config.go
diff --git a/extensions/store/pkg/config/debug.go b/services/store/pkg/config/debug.go
similarity index 100%
rename from extensions/store/pkg/config/debug.go
rename to services/store/pkg/config/debug.go
diff --git a/extensions/store/pkg/config/defaults/defaultconfig.go b/services/store/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/store/pkg/config/defaults/defaultconfig.go
rename to services/store/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/store/pkg/config/grpc.go b/services/store/pkg/config/grpc.go
similarity index 100%
rename from extensions/store/pkg/config/grpc.go
rename to services/store/pkg/config/grpc.go
diff --git a/extensions/store/pkg/config/log.go b/services/store/pkg/config/log.go
similarity index 100%
rename from extensions/store/pkg/config/log.go
rename to services/store/pkg/config/log.go
diff --git a/extensions/store/pkg/config/parser/parse.go b/services/store/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/store/pkg/config/parser/parse.go
rename to services/store/pkg/config/parser/parse.go
diff --git a/extensions/store/pkg/config/service.go b/services/store/pkg/config/service.go
similarity index 100%
rename from extensions/store/pkg/config/service.go
rename to services/store/pkg/config/service.go
diff --git a/extensions/store/pkg/config/tracing.go b/services/store/pkg/config/tracing.go
similarity index 100%
rename from extensions/store/pkg/config/tracing.go
rename to services/store/pkg/config/tracing.go
diff --git a/extensions/store/pkg/logging/logging.go b/services/store/pkg/logging/logging.go
similarity index 100%
rename from extensions/store/pkg/logging/logging.go
rename to services/store/pkg/logging/logging.go
diff --git a/extensions/store/pkg/metrics/metrics.go b/services/store/pkg/metrics/metrics.go
similarity index 100%
rename from extensions/store/pkg/metrics/metrics.go
rename to services/store/pkg/metrics/metrics.go
diff --git a/extensions/store/pkg/server/debug/option.go b/services/store/pkg/server/debug/option.go
similarity index 100%
rename from extensions/store/pkg/server/debug/option.go
rename to services/store/pkg/server/debug/option.go
diff --git a/extensions/store/pkg/server/debug/server.go b/services/store/pkg/server/debug/server.go
similarity index 100%
rename from extensions/store/pkg/server/debug/server.go
rename to services/store/pkg/server/debug/server.go
diff --git a/extensions/store/pkg/server/grpc/option.go b/services/store/pkg/server/grpc/option.go
similarity index 100%
rename from extensions/store/pkg/server/grpc/option.go
rename to services/store/pkg/server/grpc/option.go
diff --git a/extensions/store/pkg/server/grpc/server.go b/services/store/pkg/server/grpc/server.go
similarity index 100%
rename from extensions/store/pkg/server/grpc/server.go
rename to services/store/pkg/server/grpc/server.go
diff --git a/extensions/store/pkg/service/v0/option.go b/services/store/pkg/service/v0/option.go
similarity index 100%
rename from extensions/store/pkg/service/v0/option.go
rename to services/store/pkg/service/v0/option.go
diff --git a/extensions/store/pkg/service/v0/service.go b/services/store/pkg/service/v0/service.go
similarity index 100%
rename from extensions/store/pkg/service/v0/service.go
rename to services/store/pkg/service/v0/service.go
diff --git a/extensions/store/pkg/tracing/tracing.go b/services/store/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/store/pkg/tracing/tracing.go
rename to services/store/pkg/tracing/tracing.go
diff --git a/extensions/store/reflex.conf b/services/store/reflex.conf
similarity index 100%
rename from extensions/store/reflex.conf
rename to services/store/reflex.conf
diff --git a/extensions/thumbnails/Makefile b/services/thumbnails/Makefile
similarity index 100%
rename from extensions/thumbnails/Makefile
rename to services/thumbnails/Makefile
diff --git a/extensions/thumbnails/cmd/thumbnails/main.go b/services/thumbnails/cmd/thumbnails/main.go
similarity index 100%
rename from extensions/thumbnails/cmd/thumbnails/main.go
rename to services/thumbnails/cmd/thumbnails/main.go
diff --git a/extensions/thumbnails/docker/Dockerfile.linux.amd64 b/services/thumbnails/docker/Dockerfile.linux.amd64
similarity index 100%
rename from extensions/thumbnails/docker/Dockerfile.linux.amd64
rename to services/thumbnails/docker/Dockerfile.linux.amd64
diff --git a/extensions/thumbnails/docker/Dockerfile.linux.arm b/services/thumbnails/docker/Dockerfile.linux.arm
similarity index 100%
rename from extensions/thumbnails/docker/Dockerfile.linux.arm
rename to services/thumbnails/docker/Dockerfile.linux.arm
diff --git a/extensions/thumbnails/docker/Dockerfile.linux.arm64 b/services/thumbnails/docker/Dockerfile.linux.arm64
similarity index 100%
rename from extensions/thumbnails/docker/Dockerfile.linux.arm64
rename to services/thumbnails/docker/Dockerfile.linux.arm64
diff --git a/extensions/thumbnails/docker/manifest.tmpl b/services/thumbnails/docker/manifest.tmpl
similarity index 100%
rename from extensions/thumbnails/docker/manifest.tmpl
rename to services/thumbnails/docker/manifest.tmpl
diff --git a/extensions/thumbnails/pkg/command/health.go b/services/thumbnails/pkg/command/health.go
similarity index 100%
rename from extensions/thumbnails/pkg/command/health.go
rename to services/thumbnails/pkg/command/health.go
diff --git a/extensions/thumbnails/pkg/command/root.go b/services/thumbnails/pkg/command/root.go
similarity index 100%
rename from extensions/thumbnails/pkg/command/root.go
rename to services/thumbnails/pkg/command/root.go
diff --git a/extensions/thumbnails/pkg/command/server.go b/services/thumbnails/pkg/command/server.go
similarity index 100%
rename from extensions/thumbnails/pkg/command/server.go
rename to services/thumbnails/pkg/command/server.go
diff --git a/extensions/thumbnails/pkg/command/version.go b/services/thumbnails/pkg/command/version.go
similarity index 100%
rename from extensions/thumbnails/pkg/command/version.go
rename to services/thumbnails/pkg/command/version.go
diff --git a/extensions/thumbnails/pkg/config/config.go b/services/thumbnails/pkg/config/config.go
similarity index 100%
rename from extensions/thumbnails/pkg/config/config.go
rename to services/thumbnails/pkg/config/config.go
diff --git a/extensions/thumbnails/pkg/config/debug.go b/services/thumbnails/pkg/config/debug.go
similarity index 100%
rename from extensions/thumbnails/pkg/config/debug.go
rename to services/thumbnails/pkg/config/debug.go
diff --git a/extensions/thumbnails/pkg/config/defaults/defaultconfig.go b/services/thumbnails/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/thumbnails/pkg/config/defaults/defaultconfig.go
rename to services/thumbnails/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/thumbnails/pkg/config/grpc.go b/services/thumbnails/pkg/config/grpc.go
similarity index 100%
rename from extensions/thumbnails/pkg/config/grpc.go
rename to services/thumbnails/pkg/config/grpc.go
diff --git a/extensions/thumbnails/pkg/config/http.go b/services/thumbnails/pkg/config/http.go
similarity index 100%
rename from extensions/thumbnails/pkg/config/http.go
rename to services/thumbnails/pkg/config/http.go
diff --git a/extensions/thumbnails/pkg/config/log.go b/services/thumbnails/pkg/config/log.go
similarity index 100%
rename from extensions/thumbnails/pkg/config/log.go
rename to services/thumbnails/pkg/config/log.go
diff --git a/extensions/thumbnails/pkg/config/parser/parse.go b/services/thumbnails/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/thumbnails/pkg/config/parser/parse.go
rename to services/thumbnails/pkg/config/parser/parse.go
diff --git a/extensions/thumbnails/pkg/config/service.go b/services/thumbnails/pkg/config/service.go
similarity index 100%
rename from extensions/thumbnails/pkg/config/service.go
rename to services/thumbnails/pkg/config/service.go
diff --git a/extensions/thumbnails/pkg/config/tracing.go b/services/thumbnails/pkg/config/tracing.go
similarity index 100%
rename from extensions/thumbnails/pkg/config/tracing.go
rename to services/thumbnails/pkg/config/tracing.go
diff --git a/extensions/thumbnails/pkg/logging/logging.go b/services/thumbnails/pkg/logging/logging.go
similarity index 100%
rename from extensions/thumbnails/pkg/logging/logging.go
rename to services/thumbnails/pkg/logging/logging.go
diff --git a/extensions/thumbnails/pkg/metrics/metrics.go b/services/thumbnails/pkg/metrics/metrics.go
similarity index 100%
rename from extensions/thumbnails/pkg/metrics/metrics.go
rename to services/thumbnails/pkg/metrics/metrics.go
diff --git a/extensions/thumbnails/pkg/preprocessor/fontloader.go b/services/thumbnails/pkg/preprocessor/fontloader.go
similarity index 100%
rename from extensions/thumbnails/pkg/preprocessor/fontloader.go
rename to services/thumbnails/pkg/preprocessor/fontloader.go
diff --git a/extensions/thumbnails/pkg/preprocessor/preprocessor.go b/services/thumbnails/pkg/preprocessor/preprocessor.go
similarity index 100%
rename from extensions/thumbnails/pkg/preprocessor/preprocessor.go
rename to services/thumbnails/pkg/preprocessor/preprocessor.go
diff --git a/extensions/thumbnails/pkg/preprocessor/textanalyzer.go b/services/thumbnails/pkg/preprocessor/textanalyzer.go
similarity index 100%
rename from extensions/thumbnails/pkg/preprocessor/textanalyzer.go
rename to services/thumbnails/pkg/preprocessor/textanalyzer.go
diff --git a/extensions/thumbnails/pkg/preprocessor/textanalyzer_test.go b/services/thumbnails/pkg/preprocessor/textanalyzer_test.go
similarity index 100%
rename from extensions/thumbnails/pkg/preprocessor/textanalyzer_test.go
rename to services/thumbnails/pkg/preprocessor/textanalyzer_test.go
diff --git a/extensions/thumbnails/pkg/server/debug/option.go b/services/thumbnails/pkg/server/debug/option.go
similarity index 100%
rename from extensions/thumbnails/pkg/server/debug/option.go
rename to services/thumbnails/pkg/server/debug/option.go
diff --git a/extensions/thumbnails/pkg/server/debug/server.go b/services/thumbnails/pkg/server/debug/server.go
similarity index 100%
rename from extensions/thumbnails/pkg/server/debug/server.go
rename to services/thumbnails/pkg/server/debug/server.go
diff --git a/extensions/thumbnails/pkg/server/grpc/option.go b/services/thumbnails/pkg/server/grpc/option.go
similarity index 100%
rename from extensions/thumbnails/pkg/server/grpc/option.go
rename to services/thumbnails/pkg/server/grpc/option.go
diff --git a/extensions/thumbnails/pkg/server/grpc/server.go b/services/thumbnails/pkg/server/grpc/server.go
similarity index 100%
rename from extensions/thumbnails/pkg/server/grpc/server.go
rename to services/thumbnails/pkg/server/grpc/server.go
diff --git a/extensions/thumbnails/pkg/server/http/option.go b/services/thumbnails/pkg/server/http/option.go
similarity index 100%
rename from extensions/thumbnails/pkg/server/http/option.go
rename to services/thumbnails/pkg/server/http/option.go
diff --git a/extensions/thumbnails/pkg/server/http/server.go b/services/thumbnails/pkg/server/http/server.go
similarity index 100%
rename from extensions/thumbnails/pkg/server/http/server.go
rename to services/thumbnails/pkg/server/http/server.go
diff --git a/extensions/thumbnails/pkg/service/grpc/v0/decorators/base.go b/services/thumbnails/pkg/service/grpc/v0/decorators/base.go
similarity index 100%
rename from extensions/thumbnails/pkg/service/grpc/v0/decorators/base.go
rename to services/thumbnails/pkg/service/grpc/v0/decorators/base.go
diff --git a/extensions/thumbnails/pkg/service/grpc/v0/decorators/instrument.go b/services/thumbnails/pkg/service/grpc/v0/decorators/instrument.go
similarity index 100%
rename from extensions/thumbnails/pkg/service/grpc/v0/decorators/instrument.go
rename to services/thumbnails/pkg/service/grpc/v0/decorators/instrument.go
diff --git a/extensions/thumbnails/pkg/service/grpc/v0/decorators/logging.go b/services/thumbnails/pkg/service/grpc/v0/decorators/logging.go
similarity index 100%
rename from extensions/thumbnails/pkg/service/grpc/v0/decorators/logging.go
rename to services/thumbnails/pkg/service/grpc/v0/decorators/logging.go
diff --git a/extensions/thumbnails/pkg/service/grpc/v0/decorators/tracing.go b/services/thumbnails/pkg/service/grpc/v0/decorators/tracing.go
similarity index 100%
rename from extensions/thumbnails/pkg/service/grpc/v0/decorators/tracing.go
rename to services/thumbnails/pkg/service/grpc/v0/decorators/tracing.go
diff --git a/extensions/thumbnails/pkg/service/grpc/v0/option.go b/services/thumbnails/pkg/service/grpc/v0/option.go
similarity index 100%
rename from extensions/thumbnails/pkg/service/grpc/v0/option.go
rename to services/thumbnails/pkg/service/grpc/v0/option.go
diff --git a/extensions/thumbnails/pkg/service/grpc/v0/service.go b/services/thumbnails/pkg/service/grpc/v0/service.go
similarity index 100%
rename from extensions/thumbnails/pkg/service/grpc/v0/service.go
rename to services/thumbnails/pkg/service/grpc/v0/service.go
diff --git a/extensions/thumbnails/pkg/service/http/v0/instrument.go b/services/thumbnails/pkg/service/http/v0/instrument.go
similarity index 100%
rename from extensions/thumbnails/pkg/service/http/v0/instrument.go
rename to services/thumbnails/pkg/service/http/v0/instrument.go
diff --git a/extensions/thumbnails/pkg/service/http/v0/logging.go b/services/thumbnails/pkg/service/http/v0/logging.go
similarity index 100%
rename from extensions/thumbnails/pkg/service/http/v0/logging.go
rename to services/thumbnails/pkg/service/http/v0/logging.go
diff --git a/extensions/thumbnails/pkg/service/http/v0/option.go b/services/thumbnails/pkg/service/http/v0/option.go
similarity index 100%
rename from extensions/thumbnails/pkg/service/http/v0/option.go
rename to services/thumbnails/pkg/service/http/v0/option.go
diff --git a/extensions/thumbnails/pkg/service/http/v0/service.go b/services/thumbnails/pkg/service/http/v0/service.go
similarity index 100%
rename from extensions/thumbnails/pkg/service/http/v0/service.go
rename to services/thumbnails/pkg/service/http/v0/service.go
diff --git a/extensions/thumbnails/pkg/service/http/v0/tracing.go b/services/thumbnails/pkg/service/http/v0/tracing.go
similarity index 100%
rename from extensions/thumbnails/pkg/service/http/v0/tracing.go
rename to services/thumbnails/pkg/service/http/v0/tracing.go
diff --git a/extensions/thumbnails/pkg/service/jwt/jwt.go b/services/thumbnails/pkg/service/jwt/jwt.go
similarity index 100%
rename from extensions/thumbnails/pkg/service/jwt/jwt.go
rename to services/thumbnails/pkg/service/jwt/jwt.go
diff --git a/extensions/thumbnails/pkg/thumbnail/encoding.go b/services/thumbnails/pkg/thumbnail/encoding.go
similarity index 100%
rename from extensions/thumbnails/pkg/thumbnail/encoding.go
rename to services/thumbnails/pkg/thumbnail/encoding.go
diff --git a/extensions/thumbnails/pkg/thumbnail/encoding_test.go b/services/thumbnails/pkg/thumbnail/encoding_test.go
similarity index 100%
rename from extensions/thumbnails/pkg/thumbnail/encoding_test.go
rename to services/thumbnails/pkg/thumbnail/encoding_test.go
diff --git a/extensions/thumbnails/pkg/thumbnail/generator.go b/services/thumbnails/pkg/thumbnail/generator.go
similarity index 100%
rename from extensions/thumbnails/pkg/thumbnail/generator.go
rename to services/thumbnails/pkg/thumbnail/generator.go
diff --git a/extensions/thumbnails/pkg/thumbnail/imgsource/cs3.go b/services/thumbnails/pkg/thumbnail/imgsource/cs3.go
similarity index 100%
rename from extensions/thumbnails/pkg/thumbnail/imgsource/cs3.go
rename to services/thumbnails/pkg/thumbnail/imgsource/cs3.go
diff --git a/extensions/thumbnails/pkg/thumbnail/imgsource/imgsource.go b/services/thumbnails/pkg/thumbnail/imgsource/imgsource.go
similarity index 100%
rename from extensions/thumbnails/pkg/thumbnail/imgsource/imgsource.go
rename to services/thumbnails/pkg/thumbnail/imgsource/imgsource.go
diff --git a/extensions/thumbnails/pkg/thumbnail/imgsource/webdav.go b/services/thumbnails/pkg/thumbnail/imgsource/webdav.go
similarity index 100%
rename from extensions/thumbnails/pkg/thumbnail/imgsource/webdav.go
rename to services/thumbnails/pkg/thumbnail/imgsource/webdav.go
diff --git a/extensions/thumbnails/pkg/thumbnail/resolutions.go b/services/thumbnails/pkg/thumbnail/resolutions.go
similarity index 100%
rename from extensions/thumbnails/pkg/thumbnail/resolutions.go
rename to services/thumbnails/pkg/thumbnail/resolutions.go
diff --git a/extensions/thumbnails/pkg/thumbnail/resolutions_test.go b/services/thumbnails/pkg/thumbnail/resolutions_test.go
similarity index 100%
rename from extensions/thumbnails/pkg/thumbnail/resolutions_test.go
rename to services/thumbnails/pkg/thumbnail/resolutions_test.go
diff --git a/extensions/thumbnails/pkg/thumbnail/storage/filesystem.go b/services/thumbnails/pkg/thumbnail/storage/filesystem.go
similarity index 100%
rename from extensions/thumbnails/pkg/thumbnail/storage/filesystem.go
rename to services/thumbnails/pkg/thumbnail/storage/filesystem.go
diff --git a/extensions/thumbnails/pkg/thumbnail/storage/inmemory.go b/services/thumbnails/pkg/thumbnail/storage/inmemory.go
similarity index 100%
rename from extensions/thumbnails/pkg/thumbnail/storage/inmemory.go
rename to services/thumbnails/pkg/thumbnail/storage/inmemory.go
diff --git a/extensions/thumbnails/pkg/thumbnail/storage/storage.go b/services/thumbnails/pkg/thumbnail/storage/storage.go
similarity index 100%
rename from extensions/thumbnails/pkg/thumbnail/storage/storage.go
rename to services/thumbnails/pkg/thumbnail/storage/storage.go
diff --git a/extensions/thumbnails/pkg/thumbnail/thumbnail.go b/services/thumbnails/pkg/thumbnail/thumbnail.go
similarity index 100%
rename from extensions/thumbnails/pkg/thumbnail/thumbnail.go
rename to services/thumbnails/pkg/thumbnail/thumbnail.go
diff --git a/extensions/thumbnails/pkg/thumbnail/thumbnail_test.go b/services/thumbnails/pkg/thumbnail/thumbnail_test.go
similarity index 100%
rename from extensions/thumbnails/pkg/thumbnail/thumbnail_test.go
rename to services/thumbnails/pkg/thumbnail/thumbnail_test.go
diff --git a/extensions/thumbnails/pkg/tracing/tracing.go b/services/thumbnails/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/thumbnails/pkg/tracing/tracing.go
rename to services/thumbnails/pkg/tracing/tracing.go
diff --git a/extensions/thumbnails/reflex.conf b/services/thumbnails/reflex.conf
similarity index 100%
rename from extensions/thumbnails/reflex.conf
rename to services/thumbnails/reflex.conf
diff --git a/extensions/thumbnails/testdata/oc.png b/services/thumbnails/testdata/oc.png
similarity index 100%
rename from extensions/thumbnails/testdata/oc.png
rename to services/thumbnails/testdata/oc.png
diff --git a/extensions/users/Makefile b/services/users/Makefile
similarity index 100%
rename from extensions/users/Makefile
rename to services/users/Makefile
diff --git a/extensions/users/cmd/user/main.go b/services/users/cmd/user/main.go
similarity index 100%
rename from extensions/users/cmd/user/main.go
rename to services/users/cmd/user/main.go
diff --git a/extensions/users/pkg/command/health.go b/services/users/pkg/command/health.go
similarity index 100%
rename from extensions/users/pkg/command/health.go
rename to services/users/pkg/command/health.go
diff --git a/extensions/users/pkg/command/root.go b/services/users/pkg/command/root.go
similarity index 100%
rename from extensions/users/pkg/command/root.go
rename to services/users/pkg/command/root.go
diff --git a/extensions/users/pkg/command/server.go b/services/users/pkg/command/server.go
similarity index 100%
rename from extensions/users/pkg/command/server.go
rename to services/users/pkg/command/server.go
diff --git a/extensions/users/pkg/command/version.go b/services/users/pkg/command/version.go
similarity index 100%
rename from extensions/users/pkg/command/version.go
rename to services/users/pkg/command/version.go
diff --git a/extensions/users/pkg/config/config.go b/services/users/pkg/config/config.go
similarity index 100%
rename from extensions/users/pkg/config/config.go
rename to services/users/pkg/config/config.go
diff --git a/extensions/users/pkg/config/defaults/defaultconfig.go b/services/users/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/users/pkg/config/defaults/defaultconfig.go
rename to services/users/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/users/pkg/config/parser/parse.go b/services/users/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/users/pkg/config/parser/parse.go
rename to services/users/pkg/config/parser/parse.go
diff --git a/extensions/users/pkg/config/reva.go b/services/users/pkg/config/reva.go
similarity index 100%
rename from extensions/users/pkg/config/reva.go
rename to services/users/pkg/config/reva.go
diff --git a/extensions/users/pkg/logging/logging.go b/services/users/pkg/logging/logging.go
similarity index 100%
rename from extensions/users/pkg/logging/logging.go
rename to services/users/pkg/logging/logging.go
diff --git a/extensions/users/pkg/revaconfig/config.go b/services/users/pkg/revaconfig/config.go
similarity index 100%
rename from extensions/users/pkg/revaconfig/config.go
rename to services/users/pkg/revaconfig/config.go
diff --git a/extensions/users/pkg/server/debug/option.go b/services/users/pkg/server/debug/option.go
similarity index 100%
rename from extensions/users/pkg/server/debug/option.go
rename to services/users/pkg/server/debug/option.go
diff --git a/extensions/users/pkg/server/debug/server.go b/services/users/pkg/server/debug/server.go
similarity index 100%
rename from extensions/users/pkg/server/debug/server.go
rename to services/users/pkg/server/debug/server.go
diff --git a/extensions/users/pkg/tracing/tracing.go b/services/users/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/users/pkg/tracing/tracing.go
rename to services/users/pkg/tracing/tracing.go
diff --git a/extensions/web/.dockerignore b/services/web/.dockerignore
similarity index 100%
rename from extensions/web/.dockerignore
rename to services/web/.dockerignore
diff --git a/extensions/web/Makefile b/services/web/Makefile
similarity index 100%
rename from extensions/web/Makefile
rename to services/web/Makefile
diff --git a/extensions/web/assets/.keep b/services/web/assets/.keep
similarity index 100%
rename from extensions/web/assets/.keep
rename to services/web/assets/.keep
diff --git a/extensions/web/cmd/web/main.go b/services/web/cmd/web/main.go
similarity index 100%
rename from extensions/web/cmd/web/main.go
rename to services/web/cmd/web/main.go
diff --git a/extensions/web/docker/Dockerfile.linux.amd64 b/services/web/docker/Dockerfile.linux.amd64
similarity index 100%
rename from extensions/web/docker/Dockerfile.linux.amd64
rename to services/web/docker/Dockerfile.linux.amd64
diff --git a/extensions/web/docker/Dockerfile.linux.arm b/services/web/docker/Dockerfile.linux.arm
similarity index 100%
rename from extensions/web/docker/Dockerfile.linux.arm
rename to services/web/docker/Dockerfile.linux.arm
diff --git a/extensions/web/docker/Dockerfile.linux.arm64 b/services/web/docker/Dockerfile.linux.arm64
similarity index 100%
rename from extensions/web/docker/Dockerfile.linux.arm64
rename to services/web/docker/Dockerfile.linux.arm64
diff --git a/extensions/web/docker/manifest.tmpl b/services/web/docker/manifest.tmpl
similarity index 100%
rename from extensions/web/docker/manifest.tmpl
rename to services/web/docker/manifest.tmpl
diff --git a/extensions/web/pkg/assets/option.go b/services/web/pkg/assets/option.go
similarity index 100%
rename from extensions/web/pkg/assets/option.go
rename to services/web/pkg/assets/option.go
diff --git a/extensions/web/pkg/assets/server.go b/services/web/pkg/assets/server.go
similarity index 100%
rename from extensions/web/pkg/assets/server.go
rename to services/web/pkg/assets/server.go
diff --git a/extensions/web/pkg/command/health.go b/services/web/pkg/command/health.go
similarity index 100%
rename from extensions/web/pkg/command/health.go
rename to services/web/pkg/command/health.go
diff --git a/extensions/web/pkg/command/root.go b/services/web/pkg/command/root.go
similarity index 100%
rename from extensions/web/pkg/command/root.go
rename to services/web/pkg/command/root.go
diff --git a/extensions/web/pkg/command/server.go b/services/web/pkg/command/server.go
similarity index 100%
rename from extensions/web/pkg/command/server.go
rename to services/web/pkg/command/server.go
diff --git a/extensions/web/pkg/command/version.go b/services/web/pkg/command/version.go
similarity index 100%
rename from extensions/web/pkg/command/version.go
rename to services/web/pkg/command/version.go
diff --git a/extensions/web/pkg/config/config.go b/services/web/pkg/config/config.go
similarity index 100%
rename from extensions/web/pkg/config/config.go
rename to services/web/pkg/config/config.go
diff --git a/extensions/web/pkg/config/debug.go b/services/web/pkg/config/debug.go
similarity index 100%
rename from extensions/web/pkg/config/debug.go
rename to services/web/pkg/config/debug.go
diff --git a/extensions/web/pkg/config/defaults/defaultconfig.go b/services/web/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/web/pkg/config/defaults/defaultconfig.go
rename to services/web/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/web/pkg/config/http.go b/services/web/pkg/config/http.go
similarity index 100%
rename from extensions/web/pkg/config/http.go
rename to services/web/pkg/config/http.go
diff --git a/extensions/web/pkg/config/log.go b/services/web/pkg/config/log.go
similarity index 100%
rename from extensions/web/pkg/config/log.go
rename to services/web/pkg/config/log.go
diff --git a/extensions/web/pkg/config/parser/parse.go b/services/web/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/web/pkg/config/parser/parse.go
rename to services/web/pkg/config/parser/parse.go
diff --git a/extensions/web/pkg/config/service.go b/services/web/pkg/config/service.go
similarity index 100%
rename from extensions/web/pkg/config/service.go
rename to services/web/pkg/config/service.go
diff --git a/extensions/web/pkg/config/tracing.go b/services/web/pkg/config/tracing.go
similarity index 100%
rename from extensions/web/pkg/config/tracing.go
rename to services/web/pkg/config/tracing.go
diff --git a/extensions/web/pkg/logging/logging.go b/services/web/pkg/logging/logging.go
similarity index 100%
rename from extensions/web/pkg/logging/logging.go
rename to services/web/pkg/logging/logging.go
diff --git a/extensions/web/pkg/metrics/metrics.go b/services/web/pkg/metrics/metrics.go
similarity index 100%
rename from extensions/web/pkg/metrics/metrics.go
rename to services/web/pkg/metrics/metrics.go
diff --git a/extensions/web/pkg/middleware/silentrefresh.go b/services/web/pkg/middleware/silentrefresh.go
similarity index 100%
rename from extensions/web/pkg/middleware/silentrefresh.go
rename to services/web/pkg/middleware/silentrefresh.go
diff --git a/extensions/web/pkg/server/debug/option.go b/services/web/pkg/server/debug/option.go
similarity index 100%
rename from extensions/web/pkg/server/debug/option.go
rename to services/web/pkg/server/debug/option.go
diff --git a/extensions/web/pkg/server/debug/server.go b/services/web/pkg/server/debug/server.go
similarity index 100%
rename from extensions/web/pkg/server/debug/server.go
rename to services/web/pkg/server/debug/server.go
diff --git a/extensions/web/pkg/server/http/option.go b/services/web/pkg/server/http/option.go
similarity index 100%
rename from extensions/web/pkg/server/http/option.go
rename to services/web/pkg/server/http/option.go
diff --git a/extensions/web/pkg/server/http/server.go b/services/web/pkg/server/http/server.go
similarity index 100%
rename from extensions/web/pkg/server/http/server.go
rename to services/web/pkg/server/http/server.go
diff --git a/extensions/web/pkg/service/v0/instrument.go b/services/web/pkg/service/v0/instrument.go
similarity index 100%
rename from extensions/web/pkg/service/v0/instrument.go
rename to services/web/pkg/service/v0/instrument.go
diff --git a/extensions/web/pkg/service/v0/logging.go b/services/web/pkg/service/v0/logging.go
similarity index 100%
rename from extensions/web/pkg/service/v0/logging.go
rename to services/web/pkg/service/v0/logging.go
diff --git a/extensions/web/pkg/service/v0/option.go b/services/web/pkg/service/v0/option.go
similarity index 100%
rename from extensions/web/pkg/service/v0/option.go
rename to services/web/pkg/service/v0/option.go
diff --git a/extensions/web/pkg/service/v0/service.go b/services/web/pkg/service/v0/service.go
similarity index 100%
rename from extensions/web/pkg/service/v0/service.go
rename to services/web/pkg/service/v0/service.go
diff --git a/extensions/web/pkg/service/v0/tracing.go b/services/web/pkg/service/v0/tracing.go
similarity index 100%
rename from extensions/web/pkg/service/v0/tracing.go
rename to services/web/pkg/service/v0/tracing.go
diff --git a/extensions/web/pkg/tracing/tracing.go b/services/web/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/web/pkg/tracing/tracing.go
rename to services/web/pkg/tracing/tracing.go
diff --git a/extensions/web/reflex.conf b/services/web/reflex.conf
similarity index 100%
rename from extensions/web/reflex.conf
rename to services/web/reflex.conf
diff --git a/extensions/web/web.go b/services/web/web.go
similarity index 100%
rename from extensions/web/web.go
rename to services/web/web.go
diff --git a/extensions/webdav/.dockerignore b/services/webdav/.dockerignore
similarity index 100%
rename from extensions/webdav/.dockerignore
rename to services/webdav/.dockerignore
diff --git a/extensions/webdav/Makefile b/services/webdav/Makefile
similarity index 100%
rename from extensions/webdav/Makefile
rename to services/webdav/Makefile
diff --git a/extensions/webdav/cmd/webdav/main.go b/services/webdav/cmd/webdav/main.go
similarity index 100%
rename from extensions/webdav/cmd/webdav/main.go
rename to services/webdav/cmd/webdav/main.go
diff --git a/extensions/webdav/config/.gitignore b/services/webdav/config/.gitignore
similarity index 100%
rename from extensions/webdav/config/.gitignore
rename to services/webdav/config/.gitignore
diff --git a/extensions/webdav/docker/Dockerfile.linux.amd64 b/services/webdav/docker/Dockerfile.linux.amd64
similarity index 100%
rename from extensions/webdav/docker/Dockerfile.linux.amd64
rename to services/webdav/docker/Dockerfile.linux.amd64
diff --git a/extensions/webdav/docker/Dockerfile.linux.arm b/services/webdav/docker/Dockerfile.linux.arm
similarity index 100%
rename from extensions/webdav/docker/Dockerfile.linux.arm
rename to services/webdav/docker/Dockerfile.linux.arm
diff --git a/extensions/webdav/docker/Dockerfile.linux.arm64 b/services/webdav/docker/Dockerfile.linux.arm64
similarity index 100%
rename from extensions/webdav/docker/Dockerfile.linux.arm64
rename to services/webdav/docker/Dockerfile.linux.arm64
diff --git a/extensions/webdav/docker/manifest.tmpl b/services/webdav/docker/manifest.tmpl
similarity index 100%
rename from extensions/webdav/docker/manifest.tmpl
rename to services/webdav/docker/manifest.tmpl
diff --git a/extensions/webdav/pkg/command/health.go b/services/webdav/pkg/command/health.go
similarity index 100%
rename from extensions/webdav/pkg/command/health.go
rename to services/webdav/pkg/command/health.go
diff --git a/extensions/webdav/pkg/command/root.go b/services/webdav/pkg/command/root.go
similarity index 100%
rename from extensions/webdav/pkg/command/root.go
rename to services/webdav/pkg/command/root.go
diff --git a/extensions/webdav/pkg/command/server.go b/services/webdav/pkg/command/server.go
similarity index 100%
rename from extensions/webdav/pkg/command/server.go
rename to services/webdav/pkg/command/server.go
diff --git a/extensions/webdav/pkg/command/version.go b/services/webdav/pkg/command/version.go
similarity index 100%
rename from extensions/webdav/pkg/command/version.go
rename to services/webdav/pkg/command/version.go
diff --git a/extensions/webdav/pkg/config/config.go b/services/webdav/pkg/config/config.go
similarity index 100%
rename from extensions/webdav/pkg/config/config.go
rename to services/webdav/pkg/config/config.go
diff --git a/extensions/webdav/pkg/config/debug.go b/services/webdav/pkg/config/debug.go
similarity index 100%
rename from extensions/webdav/pkg/config/debug.go
rename to services/webdav/pkg/config/debug.go
diff --git a/extensions/webdav/pkg/config/defaults/defaultconfig.go b/services/webdav/pkg/config/defaults/defaultconfig.go
similarity index 100%
rename from extensions/webdav/pkg/config/defaults/defaultconfig.go
rename to services/webdav/pkg/config/defaults/defaultconfig.go
diff --git a/extensions/webdav/pkg/config/http.go b/services/webdav/pkg/config/http.go
similarity index 100%
rename from extensions/webdav/pkg/config/http.go
rename to services/webdav/pkg/config/http.go
diff --git a/extensions/webdav/pkg/config/log.go b/services/webdav/pkg/config/log.go
similarity index 100%
rename from extensions/webdav/pkg/config/log.go
rename to services/webdav/pkg/config/log.go
diff --git a/extensions/webdav/pkg/config/parser/parse.go b/services/webdav/pkg/config/parser/parse.go
similarity index 100%
rename from extensions/webdav/pkg/config/parser/parse.go
rename to services/webdav/pkg/config/parser/parse.go
diff --git a/extensions/webdav/pkg/config/service.go b/services/webdav/pkg/config/service.go
similarity index 100%
rename from extensions/webdav/pkg/config/service.go
rename to services/webdav/pkg/config/service.go
diff --git a/extensions/webdav/pkg/config/tracing.go b/services/webdav/pkg/config/tracing.go
similarity index 100%
rename from extensions/webdav/pkg/config/tracing.go
rename to services/webdav/pkg/config/tracing.go
diff --git a/extensions/webdav/pkg/constants/constants.go b/services/webdav/pkg/constants/constants.go
similarity index 100%
rename from extensions/webdav/pkg/constants/constants.go
rename to services/webdav/pkg/constants/constants.go
diff --git a/extensions/webdav/pkg/dav/requests/thumbnail.go b/services/webdav/pkg/dav/requests/thumbnail.go
similarity index 100%
rename from extensions/webdav/pkg/dav/requests/thumbnail.go
rename to services/webdav/pkg/dav/requests/thumbnail.go
diff --git a/extensions/webdav/pkg/errors/error.go b/services/webdav/pkg/errors/error.go
similarity index 100%
rename from extensions/webdav/pkg/errors/error.go
rename to services/webdav/pkg/errors/error.go
diff --git a/extensions/webdav/pkg/logging/logging.go b/services/webdav/pkg/logging/logging.go
similarity index 100%
rename from extensions/webdav/pkg/logging/logging.go
rename to services/webdav/pkg/logging/logging.go
diff --git a/extensions/webdav/pkg/metrics/metrics.go b/services/webdav/pkg/metrics/metrics.go
similarity index 100%
rename from extensions/webdav/pkg/metrics/metrics.go
rename to services/webdav/pkg/metrics/metrics.go
diff --git a/extensions/webdav/pkg/net/headers.go b/services/webdav/pkg/net/headers.go
similarity index 100%
rename from extensions/webdav/pkg/net/headers.go
rename to services/webdav/pkg/net/headers.go
diff --git a/extensions/webdav/pkg/net/net.go b/services/webdav/pkg/net/net.go
similarity index 100%
rename from extensions/webdav/pkg/net/net.go
rename to services/webdav/pkg/net/net.go
diff --git a/extensions/webdav/pkg/prop/prop.go b/services/webdav/pkg/prop/prop.go
similarity index 100%
rename from extensions/webdav/pkg/prop/prop.go
rename to services/webdav/pkg/prop/prop.go
diff --git a/extensions/webdav/pkg/propfind/propfind.go b/services/webdav/pkg/propfind/propfind.go
similarity index 100%
rename from extensions/webdav/pkg/propfind/propfind.go
rename to services/webdav/pkg/propfind/propfind.go
diff --git a/extensions/webdav/pkg/server/debug/option.go b/services/webdav/pkg/server/debug/option.go
similarity index 100%
rename from extensions/webdav/pkg/server/debug/option.go
rename to services/webdav/pkg/server/debug/option.go
diff --git a/extensions/webdav/pkg/server/debug/server.go b/services/webdav/pkg/server/debug/server.go
similarity index 100%
rename from extensions/webdav/pkg/server/debug/server.go
rename to services/webdav/pkg/server/debug/server.go
diff --git a/extensions/webdav/pkg/server/http/option.go b/services/webdav/pkg/server/http/option.go
similarity index 100%
rename from extensions/webdav/pkg/server/http/option.go
rename to services/webdav/pkg/server/http/option.go
diff --git a/extensions/webdav/pkg/server/http/server.go b/services/webdav/pkg/server/http/server.go
similarity index 100%
rename from extensions/webdav/pkg/server/http/server.go
rename to services/webdav/pkg/server/http/server.go
diff --git a/extensions/webdav/pkg/service/v0/instrument.go b/services/webdav/pkg/service/v0/instrument.go
similarity index 100%
rename from extensions/webdav/pkg/service/v0/instrument.go
rename to services/webdav/pkg/service/v0/instrument.go
diff --git a/extensions/webdav/pkg/service/v0/logging.go b/services/webdav/pkg/service/v0/logging.go
similarity index 100%
rename from extensions/webdav/pkg/service/v0/logging.go
rename to services/webdav/pkg/service/v0/logging.go
diff --git a/extensions/webdav/pkg/service/v0/option.go b/services/webdav/pkg/service/v0/option.go
similarity index 100%
rename from extensions/webdav/pkg/service/v0/option.go
rename to services/webdav/pkg/service/v0/option.go
diff --git a/extensions/webdav/pkg/service/v0/search.go b/services/webdav/pkg/service/v0/search.go
similarity index 100%
rename from extensions/webdav/pkg/service/v0/search.go
rename to services/webdav/pkg/service/v0/search.go
diff --git a/extensions/webdav/pkg/service/v0/service.go b/services/webdav/pkg/service/v0/service.go
similarity index 100%
rename from extensions/webdav/pkg/service/v0/service.go
rename to services/webdav/pkg/service/v0/service.go
diff --git a/extensions/webdav/pkg/service/v0/tracing.go b/services/webdav/pkg/service/v0/tracing.go
similarity index 100%
rename from extensions/webdav/pkg/service/v0/tracing.go
rename to services/webdav/pkg/service/v0/tracing.go
diff --git a/extensions/webdav/pkg/tracing/tracing.go b/services/webdav/pkg/tracing/tracing.go
similarity index 100%
rename from extensions/webdav/pkg/tracing/tracing.go
rename to services/webdav/pkg/tracing/tracing.go
diff --git a/extensions/webdav/reflex.conf b/services/webdav/reflex.conf
similarity index 100%
rename from extensions/webdav/reflex.conf
rename to services/webdav/reflex.conf