diff --git a/decla-red/Chart.yaml b/decla-red/Chart.yaml
deleted file mode 100644
index cdf9180..0000000
--- a/decla-red/Chart.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-apiVersion: v2
-name: decla-red
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 1.16.0
diff --git a/decla-red/templates/NOTES.txt b/decla-red/templates/NOTES.txt
deleted file mode 100644
index 90bc3bd..0000000
--- a/decla-red/templates/NOTES.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
-  {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
-  {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "decla-red.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "decla-red.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "decla-red.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "decla-red.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
-{{- end }}
diff --git a/decla-red/templates/ingress.yaml b/decla-red/templates/ingress.yaml
deleted file mode 100644
index fb41471..0000000
--- a/decla-red/templates/ingress.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "decla-red.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    {{- include "decla-red.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if .Values.ingress.tls }}
-  tls:
-    {{- range .Values.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
-  rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ . }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-          {{- end }}
-    {{- end }}
-  {{- end }}
diff --git a/decla-red/templates/serviceaccount.yaml b/decla-red/templates/serviceaccount.yaml
deleted file mode 100644
index d143f42..0000000
--- a/decla-red/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "decla-red.serviceAccountName" . }}
-  labels:
-    {{- include "decla-red.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/decla-red/values.yaml b/decla-red/values.yaml
deleted file mode 100644
index a69adad..0000000
--- a/decla-red/values.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-# Default values for decla-red.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  repository: nginx
-  pullPolicy: IfNotPresent
-  # Overrides the image tag whose default is the chart appVersion.
-  tag: ""
-
-imagePullSecrets: []
-nameOverride: ""
-fullnameOverride: ""
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
-
-podAnnotations: {}
-
-podSecurityContext: {}
-  # fsGroup: 2000
-
-securityContext: {}
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
-
-ingress:
-  enabled: false
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  hosts:
-    - host: chart-example.local
-      paths: []
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
-
-resources: 
-  limits:
-    cpu: 200m
-    memory: 256Mi
-  requests:
-    cpu: 200m
-    memory: 256Mi
-
-autoscaling:
-  enabled: true
-  minReplicas: 1
-  maxReplicas: 100
-  targetCPUUtilizationPercentage: 80
-  targetMemoryUtilizationPercentage: 80
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
diff --git a/.dockerignore b/frontend/.dockerignore
similarity index 100%
rename from .dockerignore
rename to frontend/.dockerignore
diff --git a/.gitattributes b/frontend/.gitattributes
similarity index 100%
rename from .gitattributes
rename to frontend/.gitattributes
diff --git a/.gitignore b/frontend/.gitignore
similarity index 100%
rename from .gitignore
rename to frontend/.gitignore
diff --git a/Dockerfile b/frontend/Dockerfile
similarity index 100%
rename from Dockerfile
rename to frontend/Dockerfile
diff --git a/media/declared.png b/frontend/media/declared.png
similarity index 100%
rename from media/declared.png
rename to frontend/media/declared.png
diff --git a/media/declared.psd b/frontend/media/declared.psd
similarity index 100%
rename from media/declared.psd
rename to frontend/media/declared.psd
diff --git a/package-lock.json b/frontend/package-lock.json
similarity index 100%
rename from package-lock.json
rename to frontend/package-lock.json
diff --git a/package.json b/frontend/package.json
similarity index 100%
rename from package.json
rename to frontend/package.json
diff --git a/src/index.html b/frontend/src/index.html
similarity index 100%
rename from src/index.html
rename to frontend/src/index.html
diff --git a/src/index.ts b/frontend/src/index.ts
similarity index 100%
rename from src/index.ts
rename to frontend/src/index.ts
diff --git a/src/shaders/ikeda-00-1593370449049.frag b/frontend/src/shaders/ikeda-00-1593370449049.frag
similarity index 100%
rename from src/shaders/ikeda-00-1593370449049.frag
rename to frontend/src/shaders/ikeda-00-1593370449049.frag
diff --git a/tsconfig.json b/frontend/tsconfig.json
similarity index 100%
rename from tsconfig.json
rename to frontend/tsconfig.json
diff --git a/webpack.config.js b/frontend/webpack.config.js
similarity index 100%
rename from webpack.config.js
rename to frontend/webpack.config.js
diff --git a/decla-red/.helmignore b/infrastructure/frontend/.helmignore
similarity index 100%
rename from decla-red/.helmignore
rename to infrastructure/frontend/.helmignore
diff --git a/infrastructure/frontend/Chart.yaml b/infrastructure/frontend/Chart.yaml
new file mode 100644
index 0000000..8d385a0
--- /dev/null
+++ b/infrastructure/frontend/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v2
+name: frontend
+description: A Helm chart for Kubernetes
+version: 0.0.0
+appVersion: 0.0.0
diff --git a/decla-red/templates/_helpers.tpl b/infrastructure/frontend/templates/_helpers.tpl
similarity index 65%
rename from decla-red/templates/_helpers.tpl
rename to infrastructure/frontend/templates/_helpers.tpl
index f7f72cb..2dd9b88 100644
--- a/decla-red/templates/_helpers.tpl
+++ b/infrastructure/frontend/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "decla-red.name" -}}
+{{- define "frontend.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
@@ -11,7 +11,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "decla-red.fullname" -}}
+{{- define "frontend.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -27,16 +27,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "decla-red.chart" -}}
+{{- define "frontend.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "decla-red.labels" -}}
-helm.sh/chart: {{ include "decla-red.chart" . }}
-{{ include "decla-red.selectorLabels" . }}
+{{- define "frontend.labels" -}}
+helm.sh/chart: {{ include "frontend.chart" . }}
+{{ include "frontend.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -46,18 +46,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "decla-red.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "decla-red.name" . }}
+{{- define "frontend.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "frontend.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "decla-red.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "decla-red.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
diff --git a/decla-red/templates/deployment.yaml b/infrastructure/frontend/templates/deployment.yaml
similarity index 75%
rename from decla-red/templates/deployment.yaml
rename to infrastructure/frontend/templates/deployment.yaml
index 010c552..825b15e 100644
--- a/decla-red/templates/deployment.yaml
+++ b/infrastructure/frontend/templates/deployment.yaml
@@ -1,16 +1,13 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "decla-red.fullname" . }}
+  name: {{ include "frontend.fullname" . }}
   labels:
-    {{- include "decla-red.labels" . | nindent 4 }}
+    {{- include "frontend.labels" . | nindent 4 }}
 spec:
-{{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
-{{- end }}
   selector:
     matchLabels:
-      {{- include "decla-red.selectorLabels" . | nindent 6 }}
+      {{- include "frontend.selectorLabels" . | nindent 6 }}
   template:
     metadata:
     {{- with .Values.podAnnotations }}
@@ -18,13 +15,12 @@ spec:
         {{- toYaml . | nindent 8 }}
     {{- end }}
       labels:
-        {{- include "decla-red.selectorLabels" . | nindent 8 }}
+        {{- include "frontend.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "decla-red.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
@@ -32,7 +28,7 @@ spec:
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: IfNotPresent
           ports:
             - name: http
               containerPort: 80
diff --git a/decla-red/templates/hpa.yaml b/infrastructure/frontend/templates/hpa.yaml
similarity index 61%
rename from decla-red/templates/hpa.yaml
rename to infrastructure/frontend/templates/hpa.yaml
index eead5e4..49f1c39 100644
--- a/decla-red/templates/hpa.yaml
+++ b/infrastructure/frontend/templates/hpa.yaml
@@ -1,28 +1,22 @@
-{{- if .Values.autoscaling.enabled }}
 apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ include "decla-red.fullname" . }}
+  name: {{ include "frontend.fullname" . }}
   labels:
-    {{- include "decla-red.labels" . | nindent 4 }}
+    {{- include "frontend.labels" . | nindent 4 }}
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment
-    name: {{ include "decla-red.fullname" . }}
+    name: {{ include "frontend.fullname" . }}
   minReplicas: {{ .Values.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.autoscaling.maxReplicas }}
   metrics:
-  {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
     - type: Resource
       resource:
         name: cpu
         targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-  {{- end }}
-  {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
         name: memory
         targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-  {{- end }}
-{{- end }}
diff --git a/decla-red/templates/service.yaml b/infrastructure/frontend/templates/service.yaml
similarity index 57%
rename from decla-red/templates/service.yaml
rename to infrastructure/frontend/templates/service.yaml
index adc9484..708b0ed 100644
--- a/decla-red/templates/service.yaml
+++ b/infrastructure/frontend/templates/service.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "decla-red.fullname" . }}
+  name: {{ include "frontend.fullname" . }}
   labels:
-    {{- include "decla-red.labels" . | nindent 4 }}
+    {{- include "frontend.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -12,4 +12,4 @@ spec:
       protocol: TCP
       name: http
   selector:
-    {{- include "decla-red.selectorLabels" . | nindent 4 }}
+    {{- include "frontend.selectorLabels" . | nindent 4 }}
diff --git a/decla-red/templates/tests/test-connection.yaml b/infrastructure/frontend/templates/tests/test-connection.yaml
similarity index 50%
rename from decla-red/templates/tests/test-connection.yaml
rename to infrastructure/frontend/templates/tests/test-connection.yaml
index 95e2eaa..d95398c 100644
--- a/decla-red/templates/tests/test-connection.yaml
+++ b/infrastructure/frontend/templates/tests/test-connection.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{ include "decla-red.fullname" . }}-test-connection"
+  name: "{{ include "frontend.fullname" . }}-test-connection"
   labels:
-    {{- include "decla-red.labels" . | nindent 4 }}
+    {{- include "frontend.labels" . | nindent 4 }}
   annotations:
     "helm.sh/hook": test-success
 spec:
@@ -11,5 +11,5 @@ spec:
     - name: wget
       image: busybox
       command: ['wget']
-      args: ['{{ include "decla-red.fullname" . }}:{{ .Values.service.port }}']
+      args: ['{{ include "frontend.fullname" . }}:{{ .Values.service.port }}']
   restartPolicy: Never
diff --git a/infrastructure/frontend/values.yaml b/infrastructure/frontend/values.yaml
new file mode 100644
index 0000000..de32314
--- /dev/null
+++ b/infrastructure/frontend/values.yaml
@@ -0,0 +1,44 @@
+image:
+  repository: schmelczera/declared-frontend
+  tag: ""
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+podAnnotations: {}
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 80
+
+resources:
+  limits:
+    cpu: 100m
+    memory: 128Mi
+  requests:
+    cpu: 100m
+    memory: 128Mi
+
+autoscaling:
+  minReplicas: 2
+  maxReplicas: 100
+  targetCPUUtilizationPercentage: 70
+  targetMemoryUtilizationPercentage: 80
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}