diff --git a/bin/deploy b/bin/deploy
index 6ad5a47..e5e8919 100755
--- a/bin/deploy
+++ b/bin/deploy
@@ -3,6 +3,6 @@
 # deploy the server
 #
 # usage:
-# deploy server/target/ejb-uebung-1.0-SNAPSHOT.jar
+# deploy server/target/ejb-server-1.0-SNAPSHOT.jar
 
 cp -v "$1" "$WILDFLY_BASE_DIR/deployments/"
diff --git a/client/pom.xml b/client/pom.xml
index ca2d205..58d72c5 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -13,7 +13,7 @@
     <!-- Abhängigkeit zu den EJB-Interfaces des Server-Moduls -->
     <dependency>
       <groupId>de.componentware</groupId>
-      <artifactId>ejb-uebung</artifactId>
+      <artifactId>ejb-server</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <!-- BOM für alle WildFly EJB-Client Abhängigkeiten -->
diff --git a/client/src/main/java/org/example/demo/praktikum1/aufgabe1/Client.java b/client/src/main/java/org/example/demo/praktikum1/aufgabe1/Client.java
new file mode 100644
index 0000000..f596768
--- /dev/null
+++ b/client/src/main/java/org/example/demo/praktikum1/aufgabe1/Client.java
@@ -0,0 +1,22 @@
+package org.example.demo.praktikum1.aufgabe1;
+import javax.naming.InitialContext;
+import javax.naming.Context;
+import java.util.Properties;
+
+public class Client {
+    public static void main(String[] args) throws Exception {
+        Properties props = new Properties();
+        props.setProperty(Context.INITIAL_CONTEXT_FACTORY,
+                          "org.wildfly.naming.client.WildFlyInitialContextFactory");
+        props.setProperty(Context.PROVIDER_URL, "http-remoting://localhost:8080");
+
+        InitialContext ctx = new InitialContext(props);
+        String jndiName = "ejb:/ejb-server-1.0-SNAPSHOT/Calculator!org.example.demo.praktikum1.aufgabe1.CalculatorRemote";
+        var calc = (CalculatorRemote) ctx.lookup(jndiName);
+
+        System.out.println("6 + 7 = " + calc.addiere(6, 7));
+        System.out.println("6 - 7 = " + calc.subtrahiere(6, 7));
+        System.out.println("6 * 7 = " + calc.multipliziere(6, 7));
+        System.out.println("6 / 7 = " + calc.dividiere(6, 7));
+    }
+}
diff --git a/client/src/main/java/org/example/demo/uebung1/aufgabe16/Client.java b/client/src/main/java/org/example/demo/uebung1/aufgabe16/Client.java
index e7926e4..ce5a27d 100644
--- a/client/src/main/java/org/example/demo/uebung1/aufgabe16/Client.java
+++ b/client/src/main/java/org/example/demo/uebung1/aufgabe16/Client.java
@@ -11,7 +11,7 @@ public class Client {
         props.setProperty(Context.PROVIDER_URL, "http-remoting://localhost:8080");
 
         InitialContext ctx = new InitialContext(props);
-        String jndiName = "ejb:/ejb-uebung-1.0-SNAPSHOT/Encryptor!org.example.demo.uebung1.aufgabe16.EncryptorRemote";
+        String jndiName = "ejb:/ejb-server-1.0-SNAPSHOT/Encryptor!org.example.demo.uebung1.aufgabe16.EncryptorRemote";
         EncryptorRemote encryptor = (EncryptorRemote) ctx.lookup(jndiName);
 
         String original = "Hallo Welt";
diff --git a/client/src/main/java/org/example/demo/uebung1/aufgabe17/Client.java b/client/src/main/java/org/example/demo/uebung1/aufgabe17/Client.java
index 5a5fdd1..5bdd66d 100644
--- a/client/src/main/java/org/example/demo/uebung1/aufgabe17/Client.java
+++ b/client/src/main/java/org/example/demo/uebung1/aufgabe17/Client.java
@@ -11,7 +11,7 @@ public class Client {
         props.setProperty(Context.PROVIDER_URL, "http-remoting://localhost:8080");
 
         InitialContext ctx = new InitialContext(props);
-        String jndiName = "ejb:/ejb-uebung-1.0-SNAPSHOT/Counter!org.example.demo.uebung1.aufgabe17.CounterRemote?stateful";
+        String jndiName = "ejb:/ejb-server-1.0-SNAPSHOT/Counter!org.example.demo.uebung1.aufgabe17.CounterRemote?stateful";
         CounterRemote counter = (CounterRemote) ctx.lookup(jndiName);
 
         System.out.println(counter.getAndIncrement());
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..f7a7751
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+  "name": "itc.componentware",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}
diff --git a/server/pom.xml b/server/pom.xml
index 915da1c..02df3a5 100755
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -7,7 +7,7 @@
     <version>1.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
-  <artifactId>ejb-uebung</artifactId>
+  <artifactId>ejb-server</artifactId>
   <packaging>ejb</packaging>
   <dependencies>
     <!-- Jakarta EE 10 API (wird von WildFly bereitgestellt) -->
diff --git a/server/src/main/java/org/example/demo/praktikum1/aufgabe1/Calculator.java b/server/src/main/java/org/example/demo/praktikum1/aufgabe1/Calculator.java
new file mode 100644
index 0000000..04ae7d5
--- /dev/null
+++ b/server/src/main/java/org/example/demo/praktikum1/aufgabe1/Calculator.java
@@ -0,0 +1,19 @@
+package org.example.demo.praktikum1.aufgabe1;
+import jakarta.ejb.Stateless;
+
+@Stateless
+public class Calculator implements CalculatorRemote {
+    public double addiere(float zahl1, float zahl2) {
+        return zahl1 + zahl2;
+    }
+    public double subtrahiere(float zahl1, float zahl2) {
+        return zahl1 - zahl2;
+    }
+    public double multipliziere(float zahl1, float zahl2) {
+        return zahl1 * zahl2;
+    }
+    public double dividiere(float zahl1, float zahl2) {
+        // todo: division by 0 exception?
+        return zahl1 / zahl2;
+    }
+}
diff --git a/server/src/main/java/org/example/demo/praktikum1/aufgabe1/CalculatorRemote.java b/server/src/main/java/org/example/demo/praktikum1/aufgabe1/CalculatorRemote.java
new file mode 100644
index 0000000..8b18a5f
--- /dev/null
+++ b/server/src/main/java/org/example/demo/praktikum1/aufgabe1/CalculatorRemote.java
@@ -0,0 +1,10 @@
+package org.example.demo.praktikum1.aufgabe1;
+import jakarta.ejb.Remote;
+
+@Remote
+public interface CalculatorRemote {
+    double addiere(float zahl1, float zahl2);
+    double subtrahiere(float zahl1, float zahl2);
+    double multipliziere(float zahl1, float zahl2);
+    double dividiere(float zahl1, float zahl2);
+}