diff --git a/webapp/pom.xml b/api/pom.xml
similarity index 98%
rename from webapp/pom.xml
rename to api/pom.xml
index 2c11fe4..40f4a87 100644
--- a/webapp/pom.xml
+++ b/api/pom.xml
@@ -10,9 +10,9 @@
         <artifactId>project</artifactId>
         <version>24.5.0-SNAPSHOT</version>
     </parent>
-    <artifactId>sphynx-webapp</artifactId>
+    <artifactId>sphynx-api</artifactId>
     <packaging>war</packaging>
-    <name>Sphynx - Web application</name>
+    <name>Manorrock Sphynx - REST API</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/webapp/src/main/docker/Dockerfile b/api/src/main/docker/Dockerfile
similarity index 100%
rename from webapp/src/main/docker/Dockerfile
rename to api/src/main/docker/Dockerfile
diff --git a/webapp/src/main/java/ui/ApplicationBean.java b/api/src/main/java/ui/ApplicationBean.java
similarity index 100%
rename from webapp/src/main/java/ui/ApplicationBean.java
rename to api/src/main/java/ui/ApplicationBean.java
diff --git a/webapp/src/main/webapp/WEB-INF/beans.xml b/api/src/main/webapp/WEB-INF/beans.xml
similarity index 100%
rename from webapp/src/main/webapp/WEB-INF/beans.xml
rename to api/src/main/webapp/WEB-INF/beans.xml
diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/api/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from webapp/src/main/webapp/WEB-INF/web.xml
rename to api/src/main/webapp/WEB-INF/web.xml
diff --git a/webapp/src/main/webapp/index.html b/api/src/main/webapp/index.html
similarity index 100%
rename from webapp/src/main/webapp/index.html
rename to api/src/main/webapp/index.html
diff --git a/webapp/src/main/webapp/intro.xhtml b/api/src/main/webapp/intro.xhtml
similarity index 100%
rename from webapp/src/main/webapp/intro.xhtml
rename to api/src/main/webapp/intro.xhtml
diff --git a/cli/src/main/java/com/manorrock/sphynx/cli/ExecuteCommand.java b/cli/src/main/java/com/manorrock/sphynx/cli/ExecuteCommand.java
index 61a38cf..264bd08 100644
--- a/cli/src/main/java/com/manorrock/sphynx/cli/ExecuteCommand.java
+++ b/cli/src/main/java/com/manorrock/sphynx/cli/ExecuteCommand.java
@@ -106,6 +106,7 @@ public Integer call() throws Exception {
         Process process = new ProcessBuilder()
                 .command(commands)
                 .directory(workDirectory)
+                .redirectErrorStream(true)
                 .start();
 
         InputStream processOutput = process.getInputStream();
diff --git a/pom.xml b/pom.xml
index 18ccd3b..64d95c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -233,38 +233,21 @@
       </dependency>
                   
       <dependency>
-                        
         <groupId>junit</groupId>
-                        
         <artifactId>junit</artifactId>
-                        
         <version>${junit.version}</version>
-                    
       </dependency>
-                  
       <dependency>
-         
-                
         <groupId>org.eclipse</groupId>
-                        
         <artifactId>yasson</artifactId>
-                        
         <version>${yasson.version}</version>
-                    
       </dependency>
-              
     </dependencies>
-        
   </dependencyManagement>
-      
   <modules>
-            
+    <module>api</module>
     <module>cli</module>
-            
-    <module>webapp</module>
-          
     <module>desktop</module>
     <module>shared</module>
   </modules>
-  
 </project>