diff --git a/core-client/pom.xml b/core-client/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..888deccf8f295e42fa9428b5bb234f5963451f9b
--- /dev/null
+++ b/core-client/pom.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>cz.muni.fi.pa165</groupId>
+    <artifactId>airport-manager</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>core-client</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <name>core-client</name>
+
+  <build>
+    <finalName>core-client-lib</finalName>
+    <defaultGoal>install</defaultGoal>
+
+    <plugins>
+      <plugin>
+        <groupId>org.openapitools</groupId>
+        <artifactId>openapi-generator-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+              <!-- see https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator-maven-plugin/README.md -->
+              <inputSpec>${project.basedir}/../core/openapi.yaml</inputSpec>
+              <generatorName>java</generatorName>
+              <apiPackage>cz.muni.fi.pa165.core.client</apiPackage>
+              <modelPackage>cz.muni.fi.pa165.core.client.model</modelPackage>
+              <invokerPackage>cz.muni.chat.fi.pa165.core.client.invoker</invokerPackage>
+              <verbose>false</verbose>
+              <generateApiTests>false</generateApiTests>
+              <generateModelTests>false</generateModelTests>
+              <generateApiDocumentation>true</generateApiDocumentation>
+              <generateModelDocumentation>true</generateModelDocumentation>
+              <configOptions>
+                <annotationLibrary>none</annotationLibrary>
+                <!-- see https://openapi-generator.tech/docs/generators/java/ -->
+                <library>native</library>
+                <hideGenerationTimestamp>true</hideGenerationTimestamp>
+              </configOptions>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.swagger</groupId>
+      <artifactId>swagger-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jsr310</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.openapitools</groupId>
+      <artifactId>jackson-databind-nullable</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/pom.xml b/pom.xml
index 4c96bd5ebd9795d73ffbb9595c30f684fb6feaca..ee956fde2eb50b17b3440139f5579904eab6c9fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,20 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <groupId>cz.muni.fi.pa165</groupId>
     <artifactId>airport-manager</artifactId>
     <version>1.0-SNAPSHOT</version>
-
     <modules>
         <module>core</module>
         <module>authorization</module>
         <module>report</module>
         <module>weather</module>
+        <module>core-client</module>
     </modules>
-
     <packaging>pom</packaging>
     <name>airport manager parent</name>
     <description>Airport Manager microservice with OpenAPI description</description>
@@ -30,14 +27,13 @@
             <name>Martin Slovik</name>
         </developer>
     </developers>
-
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>3.0.4</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <relativePath/>
+        <!-- lookup parent from repository -->
     </parent>
-
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
@@ -46,7 +42,6 @@
         <swagger-jakarta-version>2.2.8</swagger-jakarta-version>
         <version>1.0-SNAPSHOT</version>
     </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -54,88 +49,73 @@
             <version>${lombok.version}</version>
         </dependency>
     </dependencies>
-
     <dependencyManagement>
         <dependencies>
-
             <dependency>
                 <groupId>cz.muni.fi.pa165</groupId>
                 <artifactId>core</artifactId>
                 <version>${version}</version>
             </dependency>
-
             <dependency>
                 <groupId>cz.muni.fi.pa165</groupId>
                 <artifactId>authorization</artifactId>
                 <version>${version}</version>
             </dependency>
-
             <dependency>
                 <groupId>cz.muni.fi.pa165</groupId>
                 <artifactId>report</artifactId>
                 <version>${version}</version>
             </dependency>
-
             <dependency>
                 <groupId>cz.muni.fi.pa165</groupId>
                 <artifactId>weather</artifactId>
                 <version>${version}</version>
             </dependency>
-
             <dependency>
                 <groupId>org.mapstruct</groupId>
                 <artifactId>mapstruct</artifactId>
                 <version>${org.mapstruct.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>org.springdoc</groupId>
                 <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
                 <version>2.0.2</version>
             </dependency>
-
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-text</artifactId>
                 <version>1.10.0</version>
             </dependency>
-
             <dependency>
                 <groupId>com.google.code.findbugs</groupId>
                 <artifactId>jsr305</artifactId>
                 <version>3.0.2</version>
             </dependency>
-
             <dependency>
                 <groupId>org.openapitools</groupId>
                 <artifactId>jackson-databind-nullable</artifactId>
                 <version>0.2.6</version>
             </dependency>
-
             <dependency>
                 <groupId>io.swagger</groupId>
                 <artifactId>swagger-annotations</artifactId>
                 <version>1.6.9</version>
             </dependency>
-
             <dependency>
                 <groupId>javax.validation</groupId>
                 <artifactId>validation-api</artifactId>
                 <version>2.0.1.Final</version>
             </dependency>
-
             <dependency>
                 <groupId>javax.annotation</groupId>
                 <artifactId>javax.annotation-api</artifactId>
                 <version>1.3.2</version>
             </dependency>
-
             <dependency>
                 <groupId>io.swagger.core.v3</groupId>
                 <artifactId>swagger-models-jakarta</artifactId>
                 <version>${swagger-jakarta-version}</version>
             </dependency>
-
             <dependency>
                 <groupId>io.swagger.core.v3</groupId>
                 <artifactId>swagger-annotations-jakarta</artifactId>
@@ -143,7 +123,6 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
     <build>
         <plugins>
             <plugin>
@@ -151,8 +130,10 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>17</source> <!-- depending on your project -->
-                    <target>17</target> <!-- depending on your project -->
+                    <source>17</source>
+                    <!-- depending on your project -->
+                    <target>17</target>
+                    <!-- depending on your project -->
                     <annotationProcessorPaths>
                         <!-- Order is IMPORTANT! Lombok needs to go first -->
                         <path>
@@ -175,7 +156,6 @@
                 </configuration>
             </plugin>
         </plugins>
-
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -190,13 +170,11 @@
                         </excludes>
                     </configuration>
                 </plugin>
-
                 <plugin>
                     <groupId>org.openapitools</groupId>
                     <artifactId>openapi-generator-maven-plugin</artifactId>
                     <version>6.4.0</version>
                 </plugin>
-
                 <plugin>
                     <groupId>org.springdoc</groupId>
                     <artifactId>springdoc-openapi-maven-plugin</artifactId>
@@ -205,4 +183,4 @@
             </plugins>
         </pluginManagement>
     </build>
-</project>
\ No newline at end of file
+</project>