diff --git a/.gitignore b/.gitignore
index c2cc83e..7fa4144 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-providers/aws-credentials.txt
\ No newline at end of file
+providers/provider-family-aws/aws-credentials.txt
\ No newline at end of file
diff --git a/README.md b/README.md
index 9ee56ca..e69de29 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +0,0 @@
-AWS:
-  - https://marketplace.upbound.io/providers/upbound/provider-family-aws/v2.2.0
-  - https://marketplace.upbound.io/providers/upbound/provider-aws-s3/
-  - https://marketplace.upbound.io/providers/upbound/provider-aws-iam/v2.2.0
-  - https://marketplace.upbound.io/providers/upbound/provider-aws-account/v2.2.0
-  - https://marketplace.upbound.io/providers/upbound/provider-aws-eks/v2.2.0
-  - https://marketplace.upbound.io/providers/upbound/provider-aws-rds/v2.2.0
-  - https://marketplace.upbound.io/providers/upbound/provider-aws-vpc/v2.2.0
-  - https://marketplace.upbound.io/providers/upbound/provider-aws-acm/v2.2.0
-  - https://marketplace.upbound.io/providers/upbound/provider-aws-budgets/v2.2.0
-  - https://marketplace.upbound.io/providers/upbound/provider-aws-ec2/v2.2.0
-  - https://marketplace.upbound.io/providers/upbound/provider-aws-elbv2/v2.2.0
-  - https://marketplace.upbound.io/providers/upbound/provider-aws-organizations/v2.2.0
-  - https://marketplace.upbound.io/providers/upbound/provider-aws-redshift/v2.2.0
-  - https://marketplace.upbound.io/providers/upbound/provider-aws-route53/v2.2.0
-Helm:
-  - https://marketplace.upbound.io/providers/upbound/provider-helm/v1.0.4
-Kubernetes:
-  - https://marketplace.upbound.io/providers/upbound/provider-kubernetes/v1.1.0
-OpenTofu:
-  - https://marketplace.upbound.io/providers/upbound/provider-opentofu/v1.0.1
-ArgoCD:
-  - https://marketplace.upbound.io/providers/crossplane-contrib/provider-argocd/v0.14.1
\ No newline at end of file
diff --git a/providers/provider-argocd/README.md b/providers/provider-argocd/README.md
new file mode 100644
index 0000000..0b2d779
--- /dev/null
+++ b/providers/provider-argocd/README.md
@@ -0,0 +1,2 @@
+  - https://marketplace.upbound.io/providers/crossplane-contrib/provider-argocd/latest
+  - https://github.com/crossplane-contrib/provider-argocd 
\ No newline at end of file
diff --git a/providers/provider-argocd.yaml b/providers/provider-argocd/provider-argocd.yaml
similarity index 100%
rename from providers/provider-argocd.yaml
rename to providers/provider-argocd/provider-argocd.yaml
diff --git a/providers/provider-family-aws/README.md b/providers/provider-family-aws/README.md
new file mode 100644
index 0000000..980ce03
--- /dev/null
+++ b/providers/provider-family-aws/README.md
@@ -0,0 +1,16 @@
+  - https://marketplace.upbound.io/providers/upbound/provider-family-aws/latest
+  - https://github.com/crossplane-contrib/provider-upjet-aws
+
+  - https://marketplace.upbound.io/providers/upbound/provider-aws-account/latest
+  - https://marketplace.upbound.io/providers/upbound/provider-aws-acm/latest
+  - https://marketplace.upbound.io/providers/upbound/provider-aws-budgets/latest
+  - https://marketplace.upbound.io/providers/upbound/provider-aws-ec2/latest
+  - https://marketplace.upbound.io/providers/upbound/provider-aws-eks/latest
+  - https://marketplace.upbound.io/providers/upbound/provider-aws-elbv2/latest
+  - https://marketplace.upbound.io/providers/upbound/provider-aws-iam/latest
+  - https://marketplace.upbound.io/providers/upbound/provider-aws-organizations/latest
+  - https://marketplace.upbound.io/providers/upbound/provider-aws-rds/latest
+  - https://marketplace.upbound.io/providers/upbound/provider-aws-redshift/latest
+  - https://marketplace.upbound.io/providers/upbound/provider-aws-route53/latest
+  - https://marketplace.upbound.io/providers/upbound/provider-aws-s3/
+  - https://marketplace.upbound.io/providers/upbound/provider-aws-vpc/latest
\ No newline at end of file
diff --git a/providers/provider-aws-account.yaml b/providers/provider-family-aws/provider-aws-account.yaml
similarity index 100%
rename from providers/provider-aws-account.yaml
rename to providers/provider-family-aws/provider-aws-account.yaml
diff --git a/providers/provider-aws-acm.yaml b/providers/provider-family-aws/provider-aws-acm.yaml
similarity index 100%
rename from providers/provider-aws-acm.yaml
rename to providers/provider-family-aws/provider-aws-acm.yaml
diff --git a/providers/provider-aws-budgets.yaml b/providers/provider-family-aws/provider-aws-budgets.yaml
similarity index 100%
rename from providers/provider-aws-budgets.yaml
rename to providers/provider-family-aws/provider-aws-budgets.yaml
diff --git a/providers/provider-aws-ec2.yaml b/providers/provider-family-aws/provider-aws-ec2.yaml
similarity index 100%
rename from providers/provider-aws-ec2.yaml
rename to providers/provider-family-aws/provider-aws-ec2.yaml
diff --git a/providers/provider-aws-eks.yaml b/providers/provider-family-aws/provider-aws-eks.yaml
similarity index 100%
rename from providers/provider-aws-eks.yaml
rename to providers/provider-family-aws/provider-aws-eks.yaml
diff --git a/providers/provider-aws-elbv2.yaml b/providers/provider-family-aws/provider-aws-elbv2.yaml
similarity index 100%
rename from providers/provider-aws-elbv2.yaml
rename to providers/provider-family-aws/provider-aws-elbv2.yaml
diff --git a/providers/provider-aws-iam.yaml b/providers/provider-family-aws/provider-aws-iam.yaml
similarity index 100%
rename from providers/provider-aws-iam.yaml
rename to providers/provider-family-aws/provider-aws-iam.yaml
diff --git a/providers/provider-aws-organizations.yaml b/providers/provider-family-aws/provider-aws-organizations.yaml
similarity index 100%
rename from providers/provider-aws-organizations.yaml
rename to providers/provider-family-aws/provider-aws-organizations.yaml
diff --git a/providers/provider-aws-rds.yaml b/providers/provider-family-aws/provider-aws-rds.yaml
similarity index 100%
rename from providers/provider-aws-rds.yaml
rename to providers/provider-family-aws/provider-aws-rds.yaml
diff --git a/providers/provider-aws-redshift.yaml b/providers/provider-family-aws/provider-aws-redshift.yaml
similarity index 100%
rename from providers/provider-aws-redshift.yaml
rename to providers/provider-family-aws/provider-aws-redshift.yaml
diff --git a/providers/provider-aws-route53.yaml b/providers/provider-family-aws/provider-aws-route53.yaml
similarity index 100%
rename from providers/provider-aws-route53.yaml
rename to providers/provider-family-aws/provider-aws-route53.yaml
diff --git a/providers/provider-aws-s3.yaml b/providers/provider-family-aws/provider-aws-s3.yaml
similarity index 100%
rename from providers/provider-aws-s3.yaml
rename to providers/provider-family-aws/provider-aws-s3.yaml
diff --git a/providers/provider-aws-vpc.yaml b/providers/provider-family-aws/provider-aws-vpc.yaml
similarity index 100%
rename from providers/provider-aws-vpc.yaml
rename to providers/provider-family-aws/provider-aws-vpc.yaml
diff --git a/providers/provider-aws-config.yaml b/providers/provider-family-aws/provider-config.yaml
similarity index 100%
rename from providers/provider-aws-config.yaml
rename to providers/provider-family-aws/provider-config.yaml
diff --git a/services/acm/certaws-composition.yaml b/providers/provider-family-aws/resources/objects/acm/certaws-composition.yaml
similarity index 100%
rename from services/acm/certaws-composition.yaml
rename to providers/provider-family-aws/resources/objects/acm/certaws-composition.yaml
diff --git a/services/acm/certaws.yaml b/providers/provider-family-aws/resources/objects/acm/certaws.yaml
similarity index 100%
rename from services/acm/certaws.yaml
rename to providers/provider-family-aws/resources/objects/acm/certaws.yaml
diff --git a/providers/provider-family-aws/resources/objects/ec2/imported-ec2.yaml b/providers/provider-family-aws/resources/objects/ec2/imported-ec2.yaml
new file mode 100644
index 0000000..74fab67
--- /dev/null
+++ b/providers/provider-family-aws/resources/objects/ec2/imported-ec2.yaml
@@ -0,0 +1,13 @@
+apiVersion: ec2.aws.m.upbound.io/v1beta1
+kind: Instance
+metadata:
+  name: imported-ec2-instance
+  annotations:
+    crossplane.io/external-name: i-037556a7512bd1f4b
+spec:
+  managementPolicies: ["Observe"]
+  forProvider:
+    region: eu-west-3
+  providerConfigRef:
+    name: default
+    kind: ProviderConfig 
\ No newline at end of file
diff --git a/providers/provider-family-aws/resources/objects/ec2/test.yaml b/providers/provider-family-aws/resources/objects/ec2/test.yaml
new file mode 100644
index 0000000..1a09bad
--- /dev/null
+++ b/providers/provider-family-aws/resources/objects/ec2/test.yaml
@@ -0,0 +1,17 @@
+apiVersion: ec2.aws.m.upbound.io/v1beta1
+kind: Instance
+metadata:
+  name: imported-ec2-instance
+  annotations:
+    crossplane.io/external-name: i-037556a7512bd1f4b
+spec:
+  managementPolicies: ["*"]
+  forProvider:
+    region: eu-west-3
+    tags:
+      company: mathod
+      project: app1
+      environment: production
+  providerConfigRef:
+    name: default
+    kind: ProviderConfig 
\ No newline at end of file
diff --git a/services/iam/user.yaml b/providers/provider-family-aws/resources/objects/iam/user.yaml
similarity index 100%
rename from services/iam/user.yaml
rename to providers/provider-family-aws/resources/objects/iam/user.yaml
diff --git a/services/iam/user2.yaml b/providers/provider-family-aws/resources/objects/iam/user2.yaml
similarity index 100%
rename from services/iam/user2.yaml
rename to providers/provider-family-aws/resources/objects/iam/user2.yaml
diff --git a/services/organization/README.md b/providers/provider-family-aws/resources/objects/organization/README.md
similarity index 100%
rename from services/organization/README.md
rename to providers/provider-family-aws/resources/objects/organization/README.md
diff --git a/services/organization/accounts.yaml b/providers/provider-family-aws/resources/objects/organization/accounts.yaml
similarity index 100%
rename from services/organization/accounts.yaml
rename to providers/provider-family-aws/resources/objects/organization/accounts.yaml
diff --git a/services/organization/namespace.yaml b/providers/provider-family-aws/resources/objects/organization/namespace.yaml
similarity index 100%
rename from services/organization/namespace.yaml
rename to providers/provider-family-aws/resources/objects/organization/namespace.yaml
diff --git a/services/organization/oragnization.yaml b/providers/provider-family-aws/resources/objects/organization/oragnization.yaml
similarity index 100%
rename from services/organization/oragnization.yaml
rename to providers/provider-family-aws/resources/objects/organization/oragnization.yaml
diff --git a/services/organization/organizational-unites.yaml b/providers/provider-family-aws/resources/objects/organization/organizational-unites.yaml
similarity index 100%
rename from services/organization/organizational-unites.yaml
rename to providers/provider-family-aws/resources/objects/organization/organizational-unites.yaml
diff --git a/services/organization/policy-attachments.yaml b/providers/provider-family-aws/resources/objects/organization/policy-attachments.yaml
similarity index 100%
rename from services/organization/policy-attachments.yaml
rename to providers/provider-family-aws/resources/objects/organization/policy-attachments.yaml
diff --git a/services/organization/scp-deny-leave-org.yaml b/providers/provider-family-aws/resources/objects/organization/scp-deny-leave-org.yaml
similarity index 100%
rename from services/organization/scp-deny-leave-org.yaml
rename to providers/provider-family-aws/resources/objects/organization/scp-deny-leave-org.yaml
diff --git a/services/organization/scp-restrict-regions.yaml b/providers/provider-family-aws/resources/objects/organization/scp-restrict-regions.yaml
similarity index 100%
rename from services/organization/scp-restrict-regions.yaml
rename to providers/provider-family-aws/resources/objects/organization/scp-restrict-regions.yaml
diff --git a/services/organization/secret.yaml b/providers/provider-family-aws/resources/objects/organization/secret.yaml
similarity index 100%
rename from services/organization/secret.yaml
rename to providers/provider-family-aws/resources/objects/organization/secret.yaml
diff --git a/services/rds/README.md b/providers/provider-family-aws/resources/objects/rds/README.md
similarity index 100%
rename from services/rds/README.md
rename to providers/provider-family-aws/resources/objects/rds/README.md
diff --git a/services/rds/composition.yaml.stop b/providers/provider-family-aws/resources/objects/rds/composition.yaml.stop
similarity index 100%
rename from services/rds/composition.yaml.stop
rename to providers/provider-family-aws/resources/objects/rds/composition.yaml.stop
diff --git a/services/rds/definition.yaml.stop b/providers/provider-family-aws/resources/objects/rds/definition.yaml.stop
similarity index 100%
rename from services/rds/definition.yaml.stop
rename to providers/provider-family-aws/resources/objects/rds/definition.yaml.stop
diff --git a/services/rds/managedResources.yaml.stop b/providers/provider-family-aws/resources/objects/rds/managedResources.yaml.stop
similarity index 100%
rename from services/rds/managedResources.yaml.stop
rename to providers/provider-family-aws/resources/objects/rds/managedResources.yaml.stop
diff --git a/services/s3/bucket-generate.yaml b/providers/provider-family-aws/resources/objects/s3/bucket-generate.yaml
similarity index 100%
rename from services/s3/bucket-generate.yaml
rename to providers/provider-family-aws/resources/objects/s3/bucket-generate.yaml
diff --git a/services/s3/bucket.yaml b/providers/provider-family-aws/resources/objects/s3/bucket.yaml
similarity index 100%
rename from services/s3/bucket.yaml
rename to providers/provider-family-aws/resources/objects/s3/bucket.yaml
diff --git a/providers/provider-gitlab/README.md b/providers/provider-gitlab/README.md
new file mode 100644
index 0000000..ced24e8
--- /dev/null
+++ b/providers/provider-gitlab/README.md
@@ -0,0 +1,2 @@
+  - https://marketplace.upbound.io/providers/crossplane-contrib/provider-gitlab/latest
+  - https://github.com/crossplane-contrib/provider-gitlab
\ No newline at end of file
diff --git a/providers/provider-gitlab/provider-gitlab.yaml b/providers/provider-gitlab/provider-gitlab.yaml
new file mode 100644
index 0000000..5a01eea
--- /dev/null
+++ b/providers/provider-gitlab/provider-gitlab.yaml
@@ -0,0 +1,6 @@
+apiVersion: pkg.crossplane.io/v1
+kind: Provider
+metadata:
+  name: crossplane-contrib-provider-gitlab
+spec:
+  package: xpkg.upbound.io/crossplane-contrib/provider-gitlab:v0.14.0
\ No newline at end of file
diff --git a/providers/provider-helm/README.md b/providers/provider-helm/README.md
new file mode 100644
index 0000000..d011771
--- /dev/null
+++ b/providers/provider-helm/README.md
@@ -0,0 +1,2 @@
+  - https://marketplace.upbound.io/providers/upbound/provider-helm/latest
+  - https://github.com/crossplane-contrib/provider-helm
\ No newline at end of file
diff --git a/providers/provider-helm.yaml b/providers/provider-helm/provider-helm.yaml
similarity index 100%
rename from providers/provider-helm.yaml
rename to providers/provider-helm/provider-helm.yaml
diff --git a/providers/provider-kubernetes/README.md b/providers/provider-kubernetes/README.md
new file mode 100644
index 0000000..041f186
--- /dev/null
+++ b/providers/provider-kubernetes/README.md
@@ -0,0 +1,2 @@
+  - https://marketplace.upbound.io/providers/upbound/provider-kubernetes/latest
+  - https://github.com/crossplane-contrib/provider-kubernetes
\ No newline at end of file
diff --git a/providers/provider-kubernetes.yaml b/providers/provider-kubernetes/provider-kubernetes.yaml
similarity index 100%
rename from providers/provider-kubernetes.yaml
rename to providers/provider-kubernetes/provider-kubernetes.yaml
diff --git a/providers/provider-opentofu/README.md b/providers/provider-opentofu/README.md
new file mode 100644
index 0000000..acf5e26
--- /dev/null
+++ b/providers/provider-opentofu/README.md
@@ -0,0 +1,2 @@
+  - https://marketplace.upbound.io/providers/upbound/provider-opentofu/latest
+  - https://github.com/upbound/provider-opentofu
\ No newline at end of file
diff --git a/providers/provider-opentofu.yaml b/providers/provider-opentofu/provider-opentofu.yaml
similarity index 100%
rename from providers/provider-opentofu.yaml
rename to providers/provider-opentofu/provider-opentofu.yaml
diff --git a/providers/provider-opentofu/resources/objects/test/02-secret-gitea-credentials.yaml b/providers/provider-opentofu/resources/objects/test/02-secret-gitea-credentials.yaml
new file mode 100644
index 0000000..0c3e439
--- /dev/null
+++ b/providers/provider-opentofu/resources/objects/test/02-secret-gitea-credentials.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: gitea-credentials
+  namespace: crossplane-system
+type: Opaque
+stringData:
+  credentials: |
+    credentials "gitea.mathod.fr" {
+      token = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+    }
\ No newline at end of file
diff --git a/providers/provider-opentofu/resources/objects/test/03-providerconfig.yaml b/providers/provider-opentofu/resources/objects/test/03-providerconfig.yaml
new file mode 100644
index 0000000..e844861
--- /dev/null
+++ b/providers/provider-opentofu/resources/objects/test/03-providerconfig.yaml
@@ -0,0 +1,44 @@
+apiVersion: opentofu.m.upbound.io/v1beta1
+kind: ProviderConfig
+metadata:
+  name: gitea-tofu-config
+  namespace: crossplane-system
+spec:
+  configuration: |
+    terraform {
+      required_providers {
+        gitea = {
+          source = "go-gitea/gitea"
+          version = "~> 0.20.0"
+        }
+      }
+      
+      // Modules _must_ use remote state. The provider does not persist state.
+      backend "kubernetes" {
+        secret_suffix     = "providerconfig-gitea"
+        namespace         = "crossplane-system"
+        in_cluster_config = true
+      }
+    }
+    
+    provider "gitea" {
+      base_url = var.gitea_url
+      token    = var.gitea_token
+    }
+    
+    variable "gitea_url" {
+      type = string
+    }
+    
+    variable "gitea_token" {
+      type      = string
+      sensitive = true
+    }
+  pluginCache: true
+  credentials:
+    - filename: .tofurc
+      source: Secret
+      secretRef:
+        name: gitea-provider-creds
+        namespace: crossplane-system
+        key: credentials
\ No newline at end of file
diff --git a/providers/provider-opentofu/resources/objects/test/04-workspace-user.yaml b/providers/provider-opentofu/resources/objects/test/04-workspace-user.yaml
new file mode 100644
index 0000000..55cb169
--- /dev/null
+++ b/providers/provider-opentofu/resources/objects/test/04-workspace-user.yaml
@@ -0,0 +1,68 @@
+apiVersion: opentofu.m.upbound.io/v1beta1
+kind: Workspace
+metadata:
+  name: gitea-user
+  namespace: crossplane-system
+spec:
+  forProvider:
+    source: Inline
+    module: |
+      resource "gitea_user" "developer" {
+        username             = var.username
+        login_name           = var.login_name
+        email                = var.email
+        password             = var.password
+        must_change_password = var.must_change_password
+        admin                = var.admin
+      }
+      
+      output "user_id" {
+        value = gitea_user.developer.id
+      }
+      
+      output "username" {
+        value = gitea_user.developer.username
+      }
+      
+      variable "username" {
+        type = string
+      }
+      
+      variable "login_name" {
+        type = string
+      }
+      
+      variable "email" {
+        type = string
+      }
+      
+      variable "password" {
+        type      = string
+        sensitive = true
+      }
+      
+      variable "must_change_password" {
+        type    = bool
+        default = true
+      }
+      
+      variable "admin" {
+        type    = bool
+        default = false
+      }
+    vars:
+      - key: username
+        value: "dev-user"
+      - key: login_name
+        value: "dev-user"
+      - key: email
+        value: "dev@example.com"
+      - key: password
+        value: "ChangeMe123!"
+      - key: must_change_password
+        value: "true"
+      - key: admin
+        value: "false"
+  providerConfigRef:
+    kind: ProviderConfig
+    name: gitea-tofu-config
\ No newline at end of file
diff --git a/providers/provider-opentofu/resources/objects/test/05-workspace-repo.yaml b/providers/provider-opentofu/resources/objects/test/05-workspace-repo.yaml
new file mode 100644
index 0000000..e69de29