diff --git a/paas/deploy.sh b/paas/deploy-flink.sh
similarity index 52%
rename from paas/deploy.sh
rename to paas/deploy-flink.sh
index 325f5f0..debf8a2 100755
--- a/paas/deploy.sh
+++ b/paas/deploy-flink.sh
@@ -7,11 +7,11 @@ oc project | grep ecloud-flink-poc
 echo Project OK
 
 #Configure volumes
-oc apply -f deployments-volume.yaml
-oc apply -f web-upload-volume.yaml
-oc apply -f job-manager-working-volume.yaml
-oc apply -f job-manager-dumps-volume.yaml
-oc apply -f flink-data-volume.yaml
+oc apply -f flink/deployments-volume.yaml
+oc apply -f flink/web-upload-volume.yaml
+oc apply -f flink/job-manager-working-volume.yaml
+oc apply -f flink/job-manager-dumps-volume.yaml
+oc apply -f flink/flink-data-volume.yaml
 
 #Configure service account used by Flink to manipulate Kubernetes
 oc apply -f service-account/flink-sa-role.yaml
@@ -19,12 +19,12 @@ oc apply -f service-account/flink-sa.yaml
 oc apply -f service-account/flink-sa-rolebinding.yaml
 
 # Configuration and service definition
-oc apply -f flink-configuration-configmap.yaml
-oc apply -f jobmanager-service.yaml
+oc apply -f flink/flink-configuration-configmap.yaml
+oc apply -f flink/job-manager-service.yaml
 
 # Create the deployments for the cluster
-oc apply -f jobmanager-session-deployment.yaml
-oc apply -f taskmanager-session-deployment.yaml
+oc apply -f flink/job-manager-session-deployment.yaml
+oc apply -f flink/task-manager-session-deployment.yaml
 
 # Create client
-oc apply -f flink-client.yaml
+oc apply -f flink/flink-client.yaml
diff --git a/paas/deployments-volume.yaml b/paas/flink/deployments-volume.yaml
similarity index 100%
rename from paas/deployments-volume.yaml
rename to paas/flink/deployments-volume.yaml
diff --git a/paas/flink-client.yaml b/paas/flink/flink-client.yaml
similarity index 100%
rename from paas/flink-client.yaml
rename to paas/flink/flink-client.yaml
diff --git a/paas/flink-configuration-configmap.yaml b/paas/flink/flink-configuration-configmap.yaml
similarity index 99%
rename from paas/flink-configuration-configmap.yaml
rename to paas/flink/flink-configuration-configmap.yaml
index aa12dde..fdcef5b 100644
--- a/paas/flink-configuration-configmap.yaml
+++ b/paas/flink/flink-configuration-configmap.yaml
@@ -52,7 +52,7 @@ data:
         # the conf/masters file, this will be taken care of automatically. Yarn
         # automatically configure the host name based on the hostname of the node where the
         # JobManager runs.
-        address: flink-jobmanager
+        address: flink-job-manager
         # The RPC port where the JobManager is reachable.
         port: 6123
       memory:
diff --git a/paas/flink-data-volume.yaml b/paas/flink/flink-data-volume.yaml
similarity index 100%
rename from paas/flink-data-volume.yaml
rename to paas/flink/flink-data-volume.yaml
diff --git a/paas/job-manager-dumps-volume.yaml b/paas/flink/job-manager-dumps-volume.yaml
similarity index 100%
rename from paas/job-manager-dumps-volume.yaml
rename to paas/flink/job-manager-dumps-volume.yaml
diff --git a/paas/jobmanager-service.yaml b/paas/flink/job-manager-service.yaml
similarity index 80%
rename from paas/jobmanager-service.yaml
rename to paas/flink/job-manager-service.yaml
index bea7f51..8f154fa 100644
--- a/paas/jobmanager-service.yaml
+++ b/paas/flink/job-manager-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: flink-jobmanager
+  name: flink-job-manager
 spec:
   type: ClusterIP
   ports:
@@ -13,4 +13,4 @@ spec:
       port: 8081
   selector:
     app: flink
-    component: jobmanager
\ No newline at end of file
+    component: job-manager
\ No newline at end of file
diff --git a/paas/jobmanager-session-deployment.yaml b/paas/flink/job-manager-session-deployment.yaml
similarity index 95%
rename from paas/jobmanager-session-deployment.yaml
rename to paas/flink/job-manager-session-deployment.yaml
index 4c75c03..ab68249 100644
--- a/paas/jobmanager-session-deployment.yaml
+++ b/paas/flink/job-manager-session-deployment.yaml
@@ -1,24 +1,24 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: flink-jobmanager
+  name: flink-job-manager
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: flink
-      component: jobmanager
+      component: job-manager
   template:
     metadata:
       labels:
         app: flink
-        component: jobmanager
+        component: job-manager
     spec:
       serviceAccountName: flink-sa
       imagePullSecrets:
         - name: image-registry-pull
       containers:
-        - name: jobmanager
+        - name: job-manager
           image: registry.paas.psnc.pl/ecloud-poc/metis-processing-engine-flink:1.20-java21
           imagePullPolicy: Always
           args: ["jobmanager"]
diff --git a/paas/job-manager-working-volume.yaml b/paas/flink/job-manager-working-volume.yaml
similarity index 100%
rename from paas/job-manager-working-volume.yaml
rename to paas/flink/job-manager-working-volume.yaml
diff --git a/paas/taskmanager-session-deployment.yaml b/paas/flink/task-manager-session-deployment.yaml
similarity index 93%
rename from paas/taskmanager-session-deployment.yaml
rename to paas/flink/task-manager-session-deployment.yaml
index 83f0008..c04cdc6 100644
--- a/paas/taskmanager-session-deployment.yaml
+++ b/paas/flink/task-manager-session-deployment.yaml
@@ -1,24 +1,24 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: flink-taskmanager
+  name: flink-task-manager
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: flink
-      component: taskmanager
+      component: task-manager
   template:
     metadata:
       labels:
         app: flink
-        component: taskmanager
+        component: task-manager
     spec:
       serviceAccountName: flink-sa
       imagePullSecrets:
         - name: image-registry-pull
       containers:
-        - name: taskmanager
+        - name: task-manager
           image: registry.paas.psnc.pl/ecloud-poc/metis-processing-engine-flink:1.20-java21
           imagePullPolicy: Always
           args: ["taskmanager"]
diff --git a/paas/web-upload-volume.yaml b/paas/flink/web-upload-volume.yaml
similarity index 100%
rename from paas/web-upload-volume.yaml
rename to paas/flink/web-upload-volume.yaml
diff --git a/paas/general_settings.sh b/paas/general-settings.sh
similarity index 100%
rename from paas/general_settings.sh
rename to paas/general-settings.sh
diff --git a/paas/redeploy-app.sh b/paas/redeploy-app.sh
index eea0119..9c317ae 100755
--- a/paas/redeploy-app.sh
+++ b/paas/redeploy-app.sh
@@ -7,15 +7,15 @@ oc project | grep ecloud-flink-poc
 echo Project OK
 
 # Remove the deployments for the cluster
-oc delete -f jobmanager-session-deployment.yaml
-oc delete -f taskmanager-session-deployment.yaml
+oc delete -f flink/job-manager-session-deployment.yaml
+oc delete -f flink/task-manager-session-deployment.yaml
 
 # Remove client
-oc delete -f flink-client.yaml
+oc delete -f flink/flink-client.yaml
 
 # Create the deployments for the cluster
-oc apply -f jobmanager-session-deployment.yaml
-oc apply -f taskmanager-session-deployment.yaml
+oc apply -f flink/job-manager-session-deployment.yaml
+oc apply -f flink/task-manager-session-deployment.yaml
 
 # Create client
-oc apply -f flink-client.yaml
+oc apply -f flink/flink-client.yaml