diff --git a/openvidu-sample-app/pom.xml b/openvidu-sample-app/pom.xml
index bc5e3397..3c5bf47c 100644
--- a/openvidu-sample-app/pom.xml
+++ b/openvidu-sample-app/pom.xml
@@ -26,16 +26,6 @@
   	<build>
   
 	  	<finalName>${project.artifactId}-${project.version}</finalName>
-	  	
-	  	<resources>
-            <resource>
-                <filtering>true</filtering>
-                <directory>src/main/resources</directory>
-                <excludes>
-                    <exclude>frontend/**</exclude>
-                </excludes>
-            </resource>
-        </resources>
 	  
 	  	<plugins>
 	  	
diff --git a/openvidu-sample-app/src/main/resources/BuildFrontWarAndRun.sh b/openvidu-sample-app/src/angular/BuildFrontWarAndRun.sh
similarity index 60%
rename from openvidu-sample-app/src/main/resources/BuildFrontWarAndRun.sh
rename to openvidu-sample-app/src/angular/BuildFrontWarAndRun.sh
index 1964cd9c..4e306b13 100755
--- a/openvidu-sample-app/src/main/resources/BuildFrontWarAndRun.sh
+++ b/openvidu-sample-app/src/angular/BuildFrontWarAndRun.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 cd frontend
-ng build --output-path ../static
-cd ../../../../
+ng build --output-path ../../main/resources/static
+cd ../../../
 mvn clean package
 java -jar target/openvidu-sample-app-0.0.1-SNAPSHOT.war
diff --git a/openvidu-sample-app/src/main/resources/frontend/.angular-cli.json b/openvidu-sample-app/src/angular/frontend/.angular-cli.json
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/.angular-cli.json
rename to openvidu-sample-app/src/angular/frontend/.angular-cli.json
diff --git a/openvidu-sample-app/src/main/resources/frontend/.editorconfig b/openvidu-sample-app/src/angular/frontend/.editorconfig
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/.editorconfig
rename to openvidu-sample-app/src/angular/frontend/.editorconfig
diff --git a/openvidu-sample-app/src/main/resources/frontend/.gitignore b/openvidu-sample-app/src/angular/frontend/.gitignore
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/.gitignore
rename to openvidu-sample-app/src/angular/frontend/.gitignore
diff --git a/openvidu-sample-app/src/main/resources/frontend/README.md b/openvidu-sample-app/src/angular/frontend/README.md
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/README.md
rename to openvidu-sample-app/src/angular/frontend/README.md
diff --git a/openvidu-sample-app/src/main/resources/frontend/e2e/app.e2e-spec.ts b/openvidu-sample-app/src/angular/frontend/e2e/app.e2e-spec.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/e2e/app.e2e-spec.ts
rename to openvidu-sample-app/src/angular/frontend/e2e/app.e2e-spec.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/e2e/app.po.ts b/openvidu-sample-app/src/angular/frontend/e2e/app.po.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/e2e/app.po.ts
rename to openvidu-sample-app/src/angular/frontend/e2e/app.po.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/e2e/tsconfig.e2e.json b/openvidu-sample-app/src/angular/frontend/e2e/tsconfig.e2e.json
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/e2e/tsconfig.e2e.json
rename to openvidu-sample-app/src/angular/frontend/e2e/tsconfig.e2e.json
diff --git a/openvidu-sample-app/src/main/resources/frontend/karma.conf.js b/openvidu-sample-app/src/angular/frontend/karma.conf.js
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/karma.conf.js
rename to openvidu-sample-app/src/angular/frontend/karma.conf.js
diff --git a/openvidu-sample-app/src/main/resources/frontend/package.json b/openvidu-sample-app/src/angular/frontend/package.json
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/package.json
rename to openvidu-sample-app/src/angular/frontend/package.json
diff --git a/openvidu-sample-app/src/main/resources/frontend/protractor.conf.js b/openvidu-sample-app/src/angular/frontend/protractor.conf.js
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/protractor.conf.js
rename to openvidu-sample-app/src/angular/frontend/protractor.conf.js
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/app.component.css b/openvidu-sample-app/src/angular/frontend/src/app/app.component.css
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/app.component.css
rename to openvidu-sample-app/src/angular/frontend/src/app/app.component.css
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/app.component.html b/openvidu-sample-app/src/angular/frontend/src/app/app.component.html
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/app.component.html
rename to openvidu-sample-app/src/angular/frontend/src/app/app.component.html
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/app.component.spec.ts b/openvidu-sample-app/src/angular/frontend/src/app/app.component.spec.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/app.component.spec.ts
rename to openvidu-sample-app/src/angular/frontend/src/app/app.component.spec.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/app.component.ts b/openvidu-sample-app/src/angular/frontend/src/app/app.component.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/app.component.ts
rename to openvidu-sample-app/src/angular/frontend/src/app/app.component.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/app.module.ts b/openvidu-sample-app/src/angular/frontend/src/app/app.module.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/app.module.ts
rename to openvidu-sample-app/src/angular/frontend/src/app/app.module.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/app.routing.ts b/openvidu-sample-app/src/angular/frontend/src/app/app.routing.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/app.routing.ts
rename to openvidu-sample-app/src/angular/frontend/src/app/app.routing.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/auth.guard.ts b/openvidu-sample-app/src/angular/frontend/src/app/auth.guard.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/auth.guard.ts
rename to openvidu-sample-app/src/angular/frontend/src/app/auth.guard.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/components/dashboard/dahsboard.component.ts b/openvidu-sample-app/src/angular/frontend/src/app/components/dashboard/dahsboard.component.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/components/dashboard/dahsboard.component.ts
rename to openvidu-sample-app/src/angular/frontend/src/app/components/dashboard/dahsboard.component.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/components/dashboard/dashboard.component.css b/openvidu-sample-app/src/angular/frontend/src/app/components/dashboard/dashboard.component.css
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/components/dashboard/dashboard.component.css
rename to openvidu-sample-app/src/angular/frontend/src/app/components/dashboard/dashboard.component.css
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/components/dashboard/dashboard.component.html b/openvidu-sample-app/src/angular/frontend/src/app/components/dashboard/dashboard.component.html
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/components/dashboard/dashboard.component.html
rename to openvidu-sample-app/src/angular/frontend/src/app/components/dashboard/dashboard.component.html
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/components/dashboard/join-session-dialog.component.ts b/openvidu-sample-app/src/angular/frontend/src/app/components/dashboard/join-session-dialog.component.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/components/dashboard/join-session-dialog.component.ts
rename to openvidu-sample-app/src/angular/frontend/src/app/components/dashboard/join-session-dialog.component.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/components/error-message/error-message.component.css b/openvidu-sample-app/src/angular/frontend/src/app/components/error-message/error-message.component.css
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/components/error-message/error-message.component.css
rename to openvidu-sample-app/src/angular/frontend/src/app/components/error-message/error-message.component.css
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/components/error-message/error-message.component.html b/openvidu-sample-app/src/angular/frontend/src/app/components/error-message/error-message.component.html
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/components/error-message/error-message.component.html
rename to openvidu-sample-app/src/angular/frontend/src/app/components/error-message/error-message.component.html
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/components/error-message/error-message.component.ts b/openvidu-sample-app/src/angular/frontend/src/app/components/error-message/error-message.component.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/components/error-message/error-message.component.ts
rename to openvidu-sample-app/src/angular/frontend/src/app/components/error-message/error-message.component.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/components/lesson-details/lesson-details.component.css b/openvidu-sample-app/src/angular/frontend/src/app/components/lesson-details/lesson-details.component.css
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/components/lesson-details/lesson-details.component.css
rename to openvidu-sample-app/src/angular/frontend/src/app/components/lesson-details/lesson-details.component.css
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/components/lesson-details/lesson-details.component.html b/openvidu-sample-app/src/angular/frontend/src/app/components/lesson-details/lesson-details.component.html
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/components/lesson-details/lesson-details.component.html
rename to openvidu-sample-app/src/angular/frontend/src/app/components/lesson-details/lesson-details.component.html
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/components/lesson-details/lesson-details.component.ts b/openvidu-sample-app/src/angular/frontend/src/app/components/lesson-details/lesson-details.component.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/components/lesson-details/lesson-details.component.ts
rename to openvidu-sample-app/src/angular/frontend/src/app/components/lesson-details/lesson-details.component.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/components/presentation/presentation.component.css b/openvidu-sample-app/src/angular/frontend/src/app/components/presentation/presentation.component.css
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/components/presentation/presentation.component.css
rename to openvidu-sample-app/src/angular/frontend/src/app/components/presentation/presentation.component.css
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/components/presentation/presentation.component.html b/openvidu-sample-app/src/angular/frontend/src/app/components/presentation/presentation.component.html
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/components/presentation/presentation.component.html
rename to openvidu-sample-app/src/angular/frontend/src/app/components/presentation/presentation.component.html
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/components/presentation/presentation.component.ts b/openvidu-sample-app/src/angular/frontend/src/app/components/presentation/presentation.component.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/components/presentation/presentation.component.ts
rename to openvidu-sample-app/src/angular/frontend/src/app/components/presentation/presentation.component.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/components/profile/profile.component.css b/openvidu-sample-app/src/angular/frontend/src/app/components/profile/profile.component.css
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/components/profile/profile.component.css
rename to openvidu-sample-app/src/angular/frontend/src/app/components/profile/profile.component.css
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/components/profile/profile.component.html b/openvidu-sample-app/src/angular/frontend/src/app/components/profile/profile.component.html
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/components/profile/profile.component.html
rename to openvidu-sample-app/src/angular/frontend/src/app/components/profile/profile.component.html
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/components/profile/profile.component.ts b/openvidu-sample-app/src/angular/frontend/src/app/components/profile/profile.component.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/components/profile/profile.component.ts
rename to openvidu-sample-app/src/angular/frontend/src/app/components/profile/profile.component.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/components/video-session/video-session.component.css b/openvidu-sample-app/src/angular/frontend/src/app/components/video-session/video-session.component.css
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/components/video-session/video-session.component.css
rename to openvidu-sample-app/src/angular/frontend/src/app/components/video-session/video-session.component.css
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/components/video-session/video-session.component.html b/openvidu-sample-app/src/angular/frontend/src/app/components/video-session/video-session.component.html
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/components/video-session/video-session.component.html
rename to openvidu-sample-app/src/angular/frontend/src/app/components/video-session/video-session.component.html
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/components/video-session/video-session.component.ts b/openvidu-sample-app/src/angular/frontend/src/app/components/video-session/video-session.component.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/components/video-session/video-session.component.ts
rename to openvidu-sample-app/src/angular/frontend/src/app/components/video-session/video-session.component.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/models/lesson.ts b/openvidu-sample-app/src/angular/frontend/src/app/models/lesson.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/models/lesson.ts
rename to openvidu-sample-app/src/angular/frontend/src/app/models/lesson.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/models/user.ts b/openvidu-sample-app/src/angular/frontend/src/app/models/user.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/models/user.ts
rename to openvidu-sample-app/src/angular/frontend/src/app/models/user.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/services/authentication.service.ts b/openvidu-sample-app/src/angular/frontend/src/app/services/authentication.service.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/services/authentication.service.ts
rename to openvidu-sample-app/src/angular/frontend/src/app/services/authentication.service.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/services/lesson.service.ts b/openvidu-sample-app/src/angular/frontend/src/app/services/lesson.service.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/services/lesson.service.ts
rename to openvidu-sample-app/src/angular/frontend/src/app/services/lesson.service.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/services/user.service.ts b/openvidu-sample-app/src/angular/frontend/src/app/services/user.service.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/services/user.service.ts
rename to openvidu-sample-app/src/angular/frontend/src/app/services/user.service.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/app/services/video-session.service.ts b/openvidu-sample-app/src/angular/frontend/src/app/services/video-session.service.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/app/services/video-session.service.ts
rename to openvidu-sample-app/src/angular/frontend/src/app/services/video-session.service.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/assets/.gitkeep b/openvidu-sample-app/src/angular/frontend/src/assets/.gitkeep
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/assets/.gitkeep
rename to openvidu-sample-app/src/angular/frontend/src/assets/.gitkeep
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/environments/environment.prod.ts b/openvidu-sample-app/src/angular/frontend/src/environments/environment.prod.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/environments/environment.prod.ts
rename to openvidu-sample-app/src/angular/frontend/src/environments/environment.prod.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/environments/environment.ts b/openvidu-sample-app/src/angular/frontend/src/environments/environment.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/environments/environment.ts
rename to openvidu-sample-app/src/angular/frontend/src/environments/environment.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/favicon.ico b/openvidu-sample-app/src/angular/frontend/src/favicon.ico
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/favicon.ico
rename to openvidu-sample-app/src/angular/frontend/src/favicon.ico
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/index.html b/openvidu-sample-app/src/angular/frontend/src/index.html
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/index.html
rename to openvidu-sample-app/src/angular/frontend/src/index.html
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/main.ts b/openvidu-sample-app/src/angular/frontend/src/main.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/main.ts
rename to openvidu-sample-app/src/angular/frontend/src/main.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/polyfills.ts b/openvidu-sample-app/src/angular/frontend/src/polyfills.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/polyfills.ts
rename to openvidu-sample-app/src/angular/frontend/src/polyfills.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/styles.css b/openvidu-sample-app/src/angular/frontend/src/styles.css
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/styles.css
rename to openvidu-sample-app/src/angular/frontend/src/styles.css
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/test.ts b/openvidu-sample-app/src/angular/frontend/src/test.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/test.ts
rename to openvidu-sample-app/src/angular/frontend/src/test.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/tsconfig.app.json b/openvidu-sample-app/src/angular/frontend/src/tsconfig.app.json
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/tsconfig.app.json
rename to openvidu-sample-app/src/angular/frontend/src/tsconfig.app.json
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/tsconfig.spec.json b/openvidu-sample-app/src/angular/frontend/src/tsconfig.spec.json
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/tsconfig.spec.json
rename to openvidu-sample-app/src/angular/frontend/src/tsconfig.spec.json
diff --git a/openvidu-sample-app/src/main/resources/frontend/src/typings.d.ts b/openvidu-sample-app/src/angular/frontend/src/typings.d.ts
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/src/typings.d.ts
rename to openvidu-sample-app/src/angular/frontend/src/typings.d.ts
diff --git a/openvidu-sample-app/src/main/resources/frontend/tsconfig.json b/openvidu-sample-app/src/angular/frontend/tsconfig.json
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/tsconfig.json
rename to openvidu-sample-app/src/angular/frontend/tsconfig.json
diff --git a/openvidu-sample-app/src/main/resources/frontend/tslint.json b/openvidu-sample-app/src/angular/frontend/tslint.json
similarity index 100%
rename from openvidu-sample-app/src/main/resources/frontend/tslint.json
rename to openvidu-sample-app/src/angular/frontend/tslint.json
diff --git a/openvidu-sample-app/src/main/resources/application.properties b/openvidu-sample-app/src/main/resources/application.properties
index 452655bc..e239bb2d 100644
--- a/openvidu-sample-app/src/main/resources/application.properties
+++ b/openvidu-sample-app/src/main/resources/application.properties
@@ -1,4 +1,9 @@
 server.port: 5000
+server.ssl.enabled: true
+server.ssl.key-store: classpath:openvidu-selfsigned.jks
+server.ssl.key-store-password: openvidu
+server.ssl.key-store-type: JKS
+server.ssl.key-alias: openvidu-selfsigned
 
 spring.datasource.url: jdbc:mysql://localhost/openvidu_sample_app
 spring.datasource.username: root
diff --git a/openvidu-sample-app/src/main/resources/openvidu-selfsigned.jks b/openvidu-sample-app/src/main/resources/openvidu-selfsigned.jks
new file mode 100644
index 00000000..4a02ecc4
Binary files /dev/null and b/openvidu-sample-app/src/main/resources/openvidu-selfsigned.jks differ