diff --git a/pom.xml b/pom.xml
index 3e739daf22..594fd47d51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -587,6 +587,7 @@
                 
                 <module>spring-boot</module>
                 <module>spring-boot-admin</module>
+                <module>spring-boot-angular</module>
                 <module>spring-boot-angular-ecommerce</module>
                 <module>spring-boot-autoconfiguration</module>
                 <module>spring-boot-bootstrap</module>
@@ -1218,6 +1219,7 @@
                 
                 <module>spring-boot</module>
                 <module>spring-boot-admin</module>
+                <module>spring-boot-angular</module>
                 <module>spring-boot-angular-ecommerce</module>
                 <module>spring-boot-autoconfiguration</module>
                 <module>spring-boot-bootstrap</module>
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/.angular-cli.json b/spring-boot-angular/angularclient/.angular-cli.json
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/.angular-cli.json
rename to spring-boot-angular/angularclient/.angular-cli.json
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/.editorconfig b/spring-boot-angular/angularclient/.editorconfig
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/.editorconfig
rename to spring-boot-angular/angularclient/.editorconfig
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/.gitignore b/spring-boot-angular/angularclient/.gitignore
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/.gitignore
rename to spring-boot-angular/angularclient/.gitignore
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/README.md b/spring-boot-angular/angularclient/README.md
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/README.md
rename to spring-boot-angular/angularclient/README.md
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/e2e/app.e2e-spec.ts b/spring-boot-angular/angularclient/e2e/app.e2e-spec.ts
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/e2e/app.e2e-spec.ts
rename to spring-boot-angular/angularclient/e2e/app.e2e-spec.ts
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/e2e/app.po.ts b/spring-boot-angular/angularclient/e2e/app.po.ts
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/e2e/app.po.ts
rename to spring-boot-angular/angularclient/e2e/app.po.ts
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/e2e/tsconfig.e2e.json b/spring-boot-angular/angularclient/e2e/tsconfig.e2e.json
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/e2e/tsconfig.e2e.json
rename to spring-boot-angular/angularclient/e2e/tsconfig.e2e.json
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/karma.conf.js b/spring-boot-angular/angularclient/karma.conf.js
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/karma.conf.js
rename to spring-boot-angular/angularclient/karma.conf.js
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/package-lock.json b/spring-boot-angular/angularclient/package-lock.json
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/package-lock.json
rename to spring-boot-angular/angularclient/package-lock.json
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/package.json b/spring-boot-angular/angularclient/package.json
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/package.json
rename to spring-boot-angular/angularclient/package.json
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/protractor.conf.js b/spring-boot-angular/angularclient/protractor.conf.js
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/protractor.conf.js
rename to spring-boot-angular/angularclient/protractor.conf.js
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/app-routing.module.ts b/spring-boot-angular/angularclient/src/app/app-routing.module.ts
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/app-routing.module.ts
rename to spring-boot-angular/angularclient/src/app/app-routing.module.ts
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/app.component.css b/spring-boot-angular/angularclient/src/app/app.component.css
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/app.component.css
rename to spring-boot-angular/angularclient/src/app/app.component.css
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/app.component.html b/spring-boot-angular/angularclient/src/app/app.component.html
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/app.component.html
rename to spring-boot-angular/angularclient/src/app/app.component.html
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/app.component.spec.ts b/spring-boot-angular/angularclient/src/app/app.component.spec.ts
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/app.component.spec.ts
rename to spring-boot-angular/angularclient/src/app/app.component.spec.ts
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/app.component.ts b/spring-boot-angular/angularclient/src/app/app.component.ts
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/app.component.ts
rename to spring-boot-angular/angularclient/src/app/app.component.ts
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/app.module.ts b/spring-boot-angular/angularclient/src/app/app.module.ts
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/app.module.ts
rename to spring-boot-angular/angularclient/src/app/app.module.ts
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/model/user.ts b/spring-boot-angular/angularclient/src/app/model/user.ts
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/model/user.ts
rename to spring-boot-angular/angularclient/src/app/model/user.ts
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/service/user.service.spec.ts b/spring-boot-angular/angularclient/src/app/service/user.service.spec.ts
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/service/user.service.spec.ts
rename to spring-boot-angular/angularclient/src/app/service/user.service.spec.ts
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/service/user.service.ts b/spring-boot-angular/angularclient/src/app/service/user.service.ts
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/service/user.service.ts
rename to spring-boot-angular/angularclient/src/app/service/user.service.ts
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/user-form/user-form.component.css b/spring-boot-angular/angularclient/src/app/user-form/user-form.component.css
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/user-form/user-form.component.css
rename to spring-boot-angular/angularclient/src/app/user-form/user-form.component.css
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/user-form/user-form.component.html b/spring-boot-angular/angularclient/src/app/user-form/user-form.component.html
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/user-form/user-form.component.html
rename to spring-boot-angular/angularclient/src/app/user-form/user-form.component.html
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/user-form/user-form.component.spec.ts b/spring-boot-angular/angularclient/src/app/user-form/user-form.component.spec.ts
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/user-form/user-form.component.spec.ts
rename to spring-boot-angular/angularclient/src/app/user-form/user-form.component.spec.ts
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/user-form/user-form.component.ts b/spring-boot-angular/angularclient/src/app/user-form/user-form.component.ts
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/user-form/user-form.component.ts
rename to spring-boot-angular/angularclient/src/app/user-form/user-form.component.ts
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/user-list/user-list.component.css b/spring-boot-angular/angularclient/src/app/user-list/user-list.component.css
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/user-list/user-list.component.css
rename to spring-boot-angular/angularclient/src/app/user-list/user-list.component.css
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/user-list/user-list.component.html b/spring-boot-angular/angularclient/src/app/user-list/user-list.component.html
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/user-list/user-list.component.html
rename to spring-boot-angular/angularclient/src/app/user-list/user-list.component.html
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/user-list/user-list.component.spec.ts b/spring-boot-angular/angularclient/src/app/user-list/user-list.component.spec.ts
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/user-list/user-list.component.spec.ts
rename to spring-boot-angular/angularclient/src/app/user-list/user-list.component.spec.ts
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/user-list/user-list.component.ts b/spring-boot-angular/angularclient/src/app/user-list/user-list.component.ts
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/app/user-list/user-list.component.ts
rename to spring-boot-angular/angularclient/src/app/user-list/user-list.component.ts
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/assets/.gitkeep b/spring-boot-angular/angularclient/src/assets/.gitkeep
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/assets/.gitkeep
rename to spring-boot-angular/angularclient/src/assets/.gitkeep
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/environments/environment.prod.ts b/spring-boot-angular/angularclient/src/environments/environment.prod.ts
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/environments/environment.prod.ts
rename to spring-boot-angular/angularclient/src/environments/environment.prod.ts
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/environments/environment.ts b/spring-boot-angular/angularclient/src/environments/environment.ts
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/environments/environment.ts
rename to spring-boot-angular/angularclient/src/environments/environment.ts
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/favicon.ico b/spring-boot-angular/angularclient/src/favicon.ico
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/favicon.ico
rename to spring-boot-angular/angularclient/src/favicon.ico
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/index.html b/spring-boot-angular/angularclient/src/index.html
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/index.html
rename to spring-boot-angular/angularclient/src/index.html
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/main.ts b/spring-boot-angular/angularclient/src/main.ts
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/main.ts
rename to spring-boot-angular/angularclient/src/main.ts
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/polyfills.ts b/spring-boot-angular/angularclient/src/polyfills.ts
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/polyfills.ts
rename to spring-boot-angular/angularclient/src/polyfills.ts
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/styles.css b/spring-boot-angular/angularclient/src/styles.css
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/styles.css
rename to spring-boot-angular/angularclient/src/styles.css
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/tsconfig.app.json b/spring-boot-angular/angularclient/src/tsconfig.app.json
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/tsconfig.app.json
rename to spring-boot-angular/angularclient/src/tsconfig.app.json
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/tsconfig.spec.json b/spring-boot-angular/angularclient/src/tsconfig.spec.json
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/tsconfig.spec.json
rename to spring-boot-angular/angularclient/src/tsconfig.spec.json
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/src/typings.d.ts b/spring-boot-angular/angularclient/src/typings.d.ts
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/src/typings.d.ts
rename to spring-boot-angular/angularclient/src/typings.d.ts
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/tsconfig.json b/spring-boot-angular/angularclient/tsconfig.json
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/tsconfig.json
rename to spring-boot-angular/angularclient/tsconfig.json
diff --git a/spring-boot-angular/src/main/java/com/baeldung/angularclient/tslint.json b/spring-boot-angular/angularclient/tslint.json
similarity index 100%
rename from spring-boot-angular/src/main/java/com/baeldung/angularclient/tslint.json
rename to spring-boot-angular/angularclient/tslint.json
diff --git a/spring-boot-angular/src/main/java/com/baeldung/application/controllers/UserController.java b/spring-boot-angular/src/main/java/com/baeldung/application/controllers/UserController.java
index c101ed771f..14c90d5b10 100644
--- a/spring-boot-angular/src/main/java/com/baeldung/application/controllers/UserController.java
+++ b/spring-boot-angular/src/main/java/com/baeldung/application/controllers/UserController.java
@@ -1,6 +1,6 @@
 package com.baeldung.application.controllers;
 
-import com.application.entities.User;
+import com.baeldung.application.entities.User;
 import com.baeldung.application.repositories.UserRepository;
 import java.util.List;
 import org.springframework.web.bind.annotation.CrossOrigin;
diff --git a/spring-boot-angular/src/main/java/com/baeldung/application/repositories/UserRepository.java b/spring-boot-angular/src/main/java/com/baeldung/application/repositories/UserRepository.java
index f8ef5a4c0c..5a81cadcbe 100644
--- a/spring-boot-angular/src/main/java/com/baeldung/application/repositories/UserRepository.java
+++ b/spring-boot-angular/src/main/java/com/baeldung/application/repositories/UserRepository.java
@@ -6,5 +6,4 @@ import org.springframework.stereotype.Repository;
 import org.springframework.web.bind.annotation.CrossOrigin;
 
 @Repository
-@CrossOrigin(origins = "http://localhost:4200")
 public interface UserRepository extends CrudRepository<User, Long>{}
diff --git a/spring-boot-angular/src/main/java/com/baeldung/pom.xml b/spring-boot-angular/src/main/java/com/baeldung/pom.xml
new file mode 100644
index 0000000000..d4ebc870b4
--- /dev/null
+++ b/spring-boot-angular/src/main/java/com/baeldung/pom.xml
@@ -0,0 +1,49 @@
+<?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" 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>com.baeldung.springbootangular</groupId>
+    <artifactId>spring-boot-angular</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+    <name>Spring Boot Angular Application</name>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.1.3.RELEASE</version>
+        <relativePath/>
+    </parent>
+    <properties>
+        <java.version>1.8</java.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file