diff --git a/.dx/group_vars/all.yml b/.dx/group_vars/all.yml
index 1d32e7af..83069f67 100644
--- a/.dx/group_vars/all.yml
+++ b/.dx/group_vars/all.yml
@@ -15,7 +15,7 @@ lib_cids:
   testing: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=libs/testing')[:7] }}"
 app_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=apps')[:7] }}"
 app_cids:
-  foo: "{{ lookup('ansible.builtin.pipe', 'git rev-parse HEAD:apps/foo')[:7] }}"
+  foo: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=apps/foo')[:7] }}"
 schema_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=schemas')[:7] }}"
 schema_cids:
   postgres: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=schemas/postgres')[:7] }}"
diff --git a/apps/foo/Dockerfile b/apps/foo/Dockerfile
index 942e3d26..073dd855 100644
--- a/apps/foo/Dockerfile
+++ b/apps/foo/Dockerfile
@@ -7,5 +7,5 @@ COPY app-foo*.jar foo/app.jar
 ENTRYPOINT [ \
     "java", "-cp", "foo/app.jar:foo/libs/*", \
     "-Dconfig.file=foo/application.conf", \
-    "smecalculus.bezmen.construction.spec.App" \
+    "smecalculus.bezmen.construction.App" \
 ]
diff --git a/apps/foo/pom.xml b/apps/foo/pom.xml
index 27aea354..fc985115 100644
--- a/apps/foo/pom.xml
+++ b/apps/foo/pom.xml
@@ -21,15 +21,10 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>construction</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>client</artifactId>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>messaging</artifactId>
     </dependency>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>storage</artifactId>
diff --git a/apps/foo/src/main/java/smecalculus/bezmen/construction/App.java b/apps/foo/src/main/java/smecalculus/bezmen/construction/App.java
index cbdc43a1..c144464d 100644
--- a/apps/foo/src/main/java/smecalculus/bezmen/construction/App.java
+++ b/apps/foo/src/main/java/smecalculus/bezmen/construction/App.java
@@ -5,6 +5,22 @@
 import static smecalculus.bezmen.configuration.WebMode.SPRING_MVC;
 
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.jdbc.DataSourceHealthContributorAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.system.DiskSpaceHealthContributorAutoConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
+import org.springframework.boot.autoconfigure.context.LifecycleAutoConfiguration;
+import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.autoconfigure.dao.PersistenceExceptionTranslationAutoConfiguration;
+import org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration;
+import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
+import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
+import org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration;
+import org.springframework.boot.autoconfigure.task.TaskSchedulingAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.embedded.EmbeddedWebServerFactoryCustomizerAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.servlet.MultipartAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -27,24 +43,24 @@
 import smecalculus.bezmen.validation.EdgeValidator;
 
 @Import({ConfigBeans.class, ValidationBeans.class, MessagingBeans.class, StorageBeans.class})
-//@EnableAutoConfiguration(
-//        exclude = {
-//            LiquibaseAutoConfiguration.class,
-//            AopAutoConfiguration.class,
-//            DataSourceHealthContributorAutoConfiguration.class,
-//            DiskSpaceHealthContributorAutoConfiguration.class,
-//            EmbeddedWebServerFactoryCustomizerAutoConfiguration.class,
-//            PersistenceExceptionTranslationAutoConfiguration.class,
-//            SpringDataWebAutoConfiguration.class,
-//            HealthContributorAutoConfiguration.class,
-//            HttpMessageConvertersAutoConfiguration.class,
-//            LifecycleAutoConfiguration.class,
-//            MultipartAutoConfiguration.class,
-//            PropertyPlaceholderAutoConfiguration.class,
-//            RestTemplateAutoConfiguration.class,
-//            TaskExecutionAutoConfiguration.class,
-//            TaskSchedulingAutoConfiguration.class
-//        })
+@EnableAutoConfiguration(
+        exclude = {
+            LiquibaseAutoConfiguration.class,
+            AopAutoConfiguration.class,
+            DataSourceHealthContributorAutoConfiguration.class,
+            DiskSpaceHealthContributorAutoConfiguration.class,
+            EmbeddedWebServerFactoryCustomizerAutoConfiguration.class,
+            PersistenceExceptionTranslationAutoConfiguration.class,
+            SpringDataWebAutoConfiguration.class,
+            HealthContributorAutoConfiguration.class,
+            HttpMessageConvertersAutoConfiguration.class,
+            LifecycleAutoConfiguration.class,
+            MultipartAutoConfiguration.class,
+            PropertyPlaceholderAutoConfiguration.class,
+            RestTemplateAutoConfiguration.class,
+            TaskExecutionAutoConfiguration.class,
+            TaskSchedulingAutoConfiguration.class
+        })
 @Configuration(proxyBeanMethods = false)
 public class App {
 
diff --git a/apps/pom.xml b/apps/pom.xml
index a49dbf98..73385e19 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -23,19 +23,17 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
-  <repositories>
-    <repository>
-      <id>github</id>
-      <url>https://maven.pkg.github.com/smecalculus/bezmen</url>
-    </repository>
-  </repositories>
-
   <dependencies>
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mapstruct</groupId>
+      <artifactId>mapstruct</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <dependencyManagement>
diff --git a/libs/essentials/pom.xml b/libs/essentials/pom.xml
index 76344c5c..7328c38d 100644
--- a/libs/essentials/pom.xml
+++ b/libs/essentials/pom.xml
@@ -17,6 +17,17 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>signatures</artifactId>
     </dependency>
+    <!--VALIDATION-->
+    <dependency>
+      <groupId>org.hibernate.validator</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.expressly</groupId>
+      <artifactId>expressly</artifactId>
+      <scope>runtime</scope>
+    </dependency>
     <!--CONFIGURATION-->
     <dependency>
       <groupId>com.typesafe</groupId>
diff --git a/libs/messaging/pom.xml b/libs/messaging/pom.xml
index c77763d0..6d2ec08d 100644
--- a/libs/messaging/pom.xml
+++ b/libs/messaging/pom.xml
@@ -62,6 +62,10 @@
           <groupId>com.fasterxml.jackson.datatype</groupId>
           <artifactId>jackson-datatype-jsr310</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-autoconfigure</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <!--Test-->
diff --git a/libs/storage/src/main/java/smecalculus/bezmen/construction/OrmMyBatisBeans.java b/libs/storage/src/main/java/smecalculus/bezmen/construction/OrmMyBatisBeans.java
index acf6594b..4b2516b5 100644
--- a/libs/storage/src/main/java/smecalculus/bezmen/construction/OrmMyBatisBeans.java
+++ b/libs/storage/src/main/java/smecalculus/bezmen/construction/OrmMyBatisBeans.java
@@ -11,7 +11,7 @@
 
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnOrmMode(MY_BATIS)
-@MapperScan(basePackages = "smecalculus.bezmen.data.mybatis")
+@MapperScan(basePackages = "smecalculus.bezmen.storage.mybatis")
 public class OrmMyBatisBeans {
 
     @Bean
diff --git a/libs/storage/src/main/java/smecalculus/bezmen/construction/OrmSpringDataBeans.java b/libs/storage/src/main/java/smecalculus/bezmen/construction/OrmSpringDataBeans.java
index 09d35a39..f6fb61ab 100644
--- a/libs/storage/src/main/java/smecalculus/bezmen/construction/OrmSpringDataBeans.java
+++ b/libs/storage/src/main/java/smecalculus/bezmen/construction/OrmSpringDataBeans.java
@@ -18,7 +18,7 @@
 
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnOrmMode(SPRING_DATA)
-@EnableJdbcRepositories("smecalculus.bezmen.data.springdata")
+@EnableJdbcRepositories("smecalculus.bezmen.storage.springdata")
 public class OrmSpringDataBeans extends AbstractJdbcConfiguration {
 
     @Bean