diff --git a/.gitignore b/.gitignore
index 7bf9dd9..8a38063 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,10 @@ typings
 # Optional REPL history
 .node_repl_history
 
-# Generated files
-app/**/*.js
-app/**/*.js.map
\ No newline at end of file
+# Output of 'npm pack'
+*.tgz
+
+system-config.js*
+*.swp
+angular_registration/**/*.js
+angular_registration/**/*.map
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..f4e86c4
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,7 @@
+FROM node:6.9.0
+
+RUN mkdir /angular2-registration-login-example
+ADD angular_registration /angular2-registration-login-example/angular_registration/
+WORKDIR /angular2-registration-login-example/angular_registration/
+RUN npm install
+
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..c3722ee
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,23 @@
+PROJECT_ID := angular2-registration-login-example
+DCMP = docker-compose
+SYSTEMJS = systemjs.config.js
+
+build:
+		${DCMP} build
+
+start:
+		${DCMP} up -d
+
+stop:
+		${DCMP} stop
+
+clean:
+		find . -name "*.map" -exec rm -rf {} \;
+		rm -rf *.log
+
+execute:
+		sudo chown -R ${USER}:${USER} .
+		${MAKE} clean
+		${MAKE} build
+		${MAKE} start
+
diff --git a/README.md b/README.md
index feaddae..1f2aa13 100644
--- a/README.md
+++ b/README.md
@@ -3,3 +3,10 @@
 Angular 2 User Registration and Login Example & Tutorial
 
 To see a demo and further details go to http://jasonwatmore.com/post/2016/09/29/angular-2-user-registration-and-login-example-tutorial
+
+## How to execute
+1. First install [Git](https://git-scm.com/downloads), [Docker](https://docs.docker.com/engine/installation/) and [Docker compose](https://docs.docker.com/compose/install/)
+2. Clone this repo to your machine
+3. Type `make execute` in your favorite terminal
+4. Voilà :rocket:
+
diff --git a/app.css b/angular_registration/app.css
similarity index 100%
rename from app.css
rename to angular_registration/app.css
diff --git a/app/_directives/alert.component.html b/angular_registration/app/_directives/alert.component.html
similarity index 100%
rename from app/_directives/alert.component.html
rename to angular_registration/app/_directives/alert.component.html
diff --git a/app/_directives/alert.component.ts b/angular_registration/app/_directives/alert.component.ts
similarity index 100%
rename from app/_directives/alert.component.ts
rename to angular_registration/app/_directives/alert.component.ts
diff --git a/app/_directives/index.ts b/angular_registration/app/_directives/index.ts
similarity index 100%
rename from app/_directives/index.ts
rename to angular_registration/app/_directives/index.ts
diff --git a/app/_guards/auth.guard.ts b/angular_registration/app/_guards/auth.guard.ts
similarity index 100%
rename from app/_guards/auth.guard.ts
rename to angular_registration/app/_guards/auth.guard.ts
diff --git a/app/_guards/index.ts b/angular_registration/app/_guards/index.ts
similarity index 100%
rename from app/_guards/index.ts
rename to angular_registration/app/_guards/index.ts
diff --git a/app/_helpers/fake-backend.ts b/angular_registration/app/_helpers/fake-backend.ts
similarity index 100%
rename from app/_helpers/fake-backend.ts
rename to angular_registration/app/_helpers/fake-backend.ts
diff --git a/app/_helpers/index.ts b/angular_registration/app/_helpers/index.ts
similarity index 100%
rename from app/_helpers/index.ts
rename to angular_registration/app/_helpers/index.ts
diff --git a/app/_models/index.ts b/angular_registration/app/_models/index.ts
similarity index 100%
rename from app/_models/index.ts
rename to angular_registration/app/_models/index.ts
diff --git a/app/_models/user.ts b/angular_registration/app/_models/user.ts
similarity index 100%
rename from app/_models/user.ts
rename to angular_registration/app/_models/user.ts
diff --git a/app/_services/alert.service.ts b/angular_registration/app/_services/alert.service.ts
similarity index 100%
rename from app/_services/alert.service.ts
rename to angular_registration/app/_services/alert.service.ts
diff --git a/app/_services/authentication.service.ts b/angular_registration/app/_services/authentication.service.ts
similarity index 99%
rename from app/_services/authentication.service.ts
rename to angular_registration/app/_services/authentication.service.ts
index 9ffbd39..36fa630 100644
--- a/app/_services/authentication.service.ts
+++ b/angular_registration/app/_services/authentication.service.ts
@@ -23,4 +23,4 @@ export class AuthenticationService {
         // remove user from local storage to log user out
         localStorage.removeItem('currentUser');
     }
-}
\ No newline at end of file
+}
diff --git a/app/_services/index.ts b/angular_registration/app/_services/index.ts
similarity index 100%
rename from app/_services/index.ts
rename to angular_registration/app/_services/index.ts
diff --git a/app/_services/user.service.ts b/angular_registration/app/_services/user.service.ts
similarity index 100%
rename from app/_services/user.service.ts
rename to angular_registration/app/_services/user.service.ts
diff --git a/app/app.component.html b/angular_registration/app/app.component.html
similarity index 100%
rename from app/app.component.html
rename to angular_registration/app/app.component.html
diff --git a/app/app.component.ts b/angular_registration/app/app.component.ts
similarity index 100%
rename from app/app.component.ts
rename to angular_registration/app/app.component.ts
diff --git a/app/app.module.ts b/angular_registration/app/app.module.ts
similarity index 100%
rename from app/app.module.ts
rename to angular_registration/app/app.module.ts
diff --git a/app/app.routing.ts b/angular_registration/app/app.routing.ts
similarity index 100%
rename from app/app.routing.ts
rename to angular_registration/app/app.routing.ts
diff --git a/app/home/home.component.html b/angular_registration/app/home/home.component.html
similarity index 100%
rename from app/home/home.component.html
rename to angular_registration/app/home/home.component.html
diff --git a/app/home/home.component.ts b/angular_registration/app/home/home.component.ts
similarity index 100%
rename from app/home/home.component.ts
rename to angular_registration/app/home/home.component.ts
diff --git a/app/home/index.ts b/angular_registration/app/home/index.ts
similarity index 100%
rename from app/home/index.ts
rename to angular_registration/app/home/index.ts
diff --git a/app/login/index.ts b/angular_registration/app/login/index.ts
similarity index 100%
rename from app/login/index.ts
rename to angular_registration/app/login/index.ts
diff --git a/app/login/login.component.html b/angular_registration/app/login/login.component.html
similarity index 100%
rename from app/login/login.component.html
rename to angular_registration/app/login/login.component.html
diff --git a/app/login/login.component.ts b/angular_registration/app/login/login.component.ts
similarity index 100%
rename from app/login/login.component.ts
rename to angular_registration/app/login/login.component.ts
diff --git a/app/main.ts b/angular_registration/app/main.ts
similarity index 100%
rename from app/main.ts
rename to angular_registration/app/main.ts
diff --git a/app/register/index.ts b/angular_registration/app/register/index.ts
similarity index 100%
rename from app/register/index.ts
rename to angular_registration/app/register/index.ts
diff --git a/app/register/register.component.html b/angular_registration/app/register/register.component.html
similarity index 100%
rename from app/register/register.component.html
rename to angular_registration/app/register/register.component.html
diff --git a/app/register/register.component.ts b/angular_registration/app/register/register.component.ts
similarity index 100%
rename from app/register/register.component.ts
rename to angular_registration/app/register/register.component.ts
diff --git a/index.html b/angular_registration/index.html
similarity index 100%
rename from index.html
rename to angular_registration/index.html
diff --git a/package.json b/angular_registration/package.json
similarity index 93%
rename from package.json
rename to angular_registration/package.json
index bb98422..f27b5eb 100644
--- a/package.json
+++ b/angular_registration/package.json
@@ -2,7 +2,7 @@
     "name": "angular2-registration-login-example",
     "version": "1.0.0",
     "scripts": {
-        "start": "tsc && concurrently \"npm run tsc:w\" \"npm run lite\" ",
+        "start": "concurrently \"npm run tsc:w\" \"npm run lite\" ",
         "lite": "lite-server",
         "postinstall": "typings install",
         "tsc": "tsc",
diff --git a/systemjs.config.js b/angular_registration/systemjs.config.js
similarity index 100%
rename from systemjs.config.js
rename to angular_registration/systemjs.config.js
diff --git a/tsconfig.json b/angular_registration/tsconfig.json
similarity index 100%
rename from tsconfig.json
rename to angular_registration/tsconfig.json
diff --git a/typings.json b/angular_registration/typings.json
similarity index 100%
rename from typings.json
rename to angular_registration/typings.json
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..e10a95d
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,11 @@
+version: '2'
+services:
+  web:
+    restart: always
+    build: .
+    command: bash -c "cd /angular2-registration-login-example/angular_registration/ && npm start"
+    volumes:
+      - .:/angular2-registration-login-example
+      - /angular2-registration-login-example/angular_registration/node_modules
+    ports:
+      - "3000:3000"