diff --git a/scripts/imagemin.js b/scripts/imagemin.js
index cfdafda..bacee48 100644
--- a/scripts/imagemin.js
+++ b/scripts/imagemin.js
@@ -1,15 +1,14 @@
 var Imagemin = require('imagemin');
 
 new Imagemin()
-	.src('src/images/**/*.{gif,jpg,png,svg}')
-	.dest('dist/images')
+	.src('src/assets/images/**/*.{gif,jpg,png,svg}')
+	.dest('dist/assets/images')
 	.use(Imagemin.jpegtran({ progressive: true }))
 	.use(Imagemin.gifsicle({ interlaced: true }))
 	.use(Imagemin.optipng())
 	.use(Imagemin.svgo({ cleanupIDs: false }))
 	.run(function (err, files) {
         if (err) {
-            console.error('Error:', err);
+            console.error('Error:', err, files);
         }
-		console.log(files[0]);
 	});
diff --git a/scripts/server.js b/scripts/server.js
index e21c86e..f803df8 100644
--- a/scripts/server.js
+++ b/scripts/server.js
@@ -28,7 +28,7 @@ if (argv.env && argv.env === 'build') {
         },
         files: [
             '.tmp/styles/index.css',
-            'src/images/**/*',
+            'src/assets/images/**/*',
             {
                 match: ['src/styles/**/*.scss'],
                 fn: function(event, file) {
diff --git a/src/images/bg-mobile.jpg b/src/assets/images/bg-mobile.jpg
similarity index 100%
rename from src/images/bg-mobile.jpg
rename to src/assets/images/bg-mobile.jpg
diff --git a/src/images/bg-web.jpg b/src/assets/images/bg-web.jpg
similarity index 100%
rename from src/images/bg-web.jpg
rename to src/assets/images/bg-web.jpg
diff --git a/src/images/grunge-over-image.png b/src/assets/images/grunge-over-image.png
similarity index 100%
rename from src/images/grunge-over-image.png
rename to src/assets/images/grunge-over-image.png
diff --git a/src/images/grunge-white-top.gif b/src/assets/images/grunge-white-top.gif
similarity index 100%
rename from src/images/grunge-white-top.gif
rename to src/assets/images/grunge-white-top.gif
diff --git a/src/images/grunge-white-top.jpg b/src/assets/images/grunge-white-top.jpg
similarity index 100%
rename from src/images/grunge-white-top.jpg
rename to src/assets/images/grunge-white-top.jpg
diff --git a/src/images/h1-my-story.png b/src/assets/images/h1-my-story.png
similarity index 100%
rename from src/images/h1-my-story.png
rename to src/assets/images/h1-my-story.png
diff --git a/src/images/h1-walk-with.png b/src/assets/images/h1-walk-with.png
similarity index 100%
rename from src/images/h1-walk-with.png
rename to src/assets/images/h1-walk-with.png
diff --git a/src/images/icons/checkmark.svg b/src/assets/images/icons/checkmark.svg
similarity index 100%
rename from src/images/icons/checkmark.svg
rename to src/assets/images/icons/checkmark.svg
diff --git a/src/images/icons/error.svg b/src/assets/images/icons/error.svg
similarity index 100%
rename from src/images/icons/error.svg
rename to src/assets/images/icons/error.svg
diff --git a/src/images/journey/Emad.jpg b/src/assets/images/journey/Emad.jpg
similarity index 100%
rename from src/images/journey/Emad.jpg
rename to src/assets/images/journey/Emad.jpg
diff --git a/src/images/journey/Heba.jpg b/src/assets/images/journey/Heba.jpg
similarity index 100%
rename from src/images/journey/Heba.jpg
rename to src/assets/images/journey/Heba.jpg
diff --git a/src/images/journey/Kana.jpg b/src/assets/images/journey/Kana.jpg
similarity index 100%
rename from src/images/journey/Kana.jpg
rename to src/assets/images/journey/Kana.jpg
diff --git a/src/images/journey/Mohammed.jpg b/src/assets/images/journey/Mohammed.jpg
similarity index 100%
rename from src/images/journey/Mohammed.jpg
rename to src/assets/images/journey/Mohammed.jpg
diff --git a/src/images/journey/Tariq.jpg b/src/assets/images/journey/Tariq.jpg
similarity index 100%
rename from src/images/journey/Tariq.jpg
rename to src/assets/images/journey/Tariq.jpg
diff --git a/src/images/journey/Hamada.jpg b/src/assets/images/journey/hamada.jpg
similarity index 100%
rename from src/images/journey/Hamada.jpg
rename to src/assets/images/journey/hamada.jpg
diff --git a/src/images/journey/map-aleppo-to-berlin.gif b/src/assets/images/journey/map-aleppo-to-berlin.gif
similarity index 100%
rename from src/images/journey/map-aleppo-to-berlin.gif
rename to src/assets/images/journey/map-aleppo-to-berlin.gif
diff --git a/src/images/journey/map-cairo-to-berlin.gif b/src/assets/images/journey/map-cairo-to-berlin.gif
similarity index 100%
rename from src/images/journey/map-cairo-to-berlin.gif
rename to src/assets/images/journey/map-cairo-to-berlin.gif
diff --git a/src/images/journey/Sahar.jpg b/src/assets/images/journey/sahar.jpg
similarity index 100%
rename from src/images/journey/Sahar.jpg
rename to src/assets/images/journey/sahar.jpg
diff --git a/src/images/journey/Zahira.jpg b/src/assets/images/journey/zahira.jpg
similarity index 100%
rename from src/images/journey/Zahira.jpg
rename to src/assets/images/journey/zahira.jpg
diff --git a/src/images/spinner.svg b/src/assets/images/spinner.svg
similarity index 100%
rename from src/images/spinner.svg
rename to src/assets/images/spinner.svg
diff --git a/src/images/walk-with-me-logo.png b/src/assets/images/walk-with-me-logo.png
similarity index 100%
rename from src/images/walk-with-me-logo.png
rename to src/assets/images/walk-with-me-logo.png
diff --git a/src/sections/addProfile.html b/src/sections/addProfile.html
index 4decfc3..697091f 100644
--- a/src/sections/addProfile.html
+++ b/src/sections/addProfile.html
@@ -1,9 +1,10 @@
 <section id="add-profile">
     <header>
-        <img ui-sref="home" src="images/walk-with-me-logo.png" alt="Walk With Me: Berlin" title="Walk With Me: Berlin" width="230"/>
+        <img ui-sref="home" src="assets/images/walk-with-me-logo.png" alt="Walk With Me: Berlin" title="Walk With Me: Berlin" width="230"/>
     </header>
 
     <h2>Add A Profile</h2>
+    <button ng-click="vm.sendMail()">Send Email</button>
 
     <form name="form" autocomplete="off" novalidate>
         <ul>
@@ -12,6 +13,7 @@ <h2>Add A Profile</h2>
                 <button type="file"
                         ng-show="form.file.$invalid"
                         ngf-select="vm.uploadPhoto($file)"
+                        ngf-fix-orientation="true"
                         ng-model="vm.photo"
                         name="file"
                         accept="image/*"
@@ -24,7 +26,7 @@ <h2>Add A Profile</h2>
                 <button ng-show="vm.photo.result" ng-click="vm.photo = null">Remove</button>
                 <div    ng-show="vm.photo.progress >= 0 && !vm.photo.result" class="progress" style="width:{{vm.photo.progress}}%">
                     <span ng-hide="vm.photo.showSpinner" ng-bind="vm.photo.progress + '%'"></span>
-                    <img ng-show="vm.photo.showSpinner" src="images/spinner.svg" alt="loading indicator" height="24" />
+                    <img ng-show="vm.photo.showSpinner" src="assets/images/spinner.svg" alt="loading indicator" height="24" />
                 </div>
                 <div    ng-show="vm.errorMsg" class="error-message" ng-bind="vm.errorMsg"></div>
                 <div    ng-show="form.file.$error.maxSize" class="error-message">This photo is too large. Photo size can be maxium 20MB.</div>
@@ -47,8 +49,8 @@ <h2>Add A Profile</h2>
             <li class="name input-group">
                 <label for="name">Name</label>
                 <input id="name" type="text" name="name" ng-model="vm.refugee.name" placeholder="Zahira Musterfrau" required autocomplete="off" />
-                <img src="images/icons/checkmark.svg" ng-if="form.name.$valid" class="icon checkmark" alt="Checkmark Icon" />
-                <img src="images/icons/error.svg" ng-if="form.name.$touched && form.name.$invalid" class="icon error" alt="Error Icon" />
+                <img src="assets/images/icons/checkmark.svg" ng-if="form.name.$valid" class="icon checkmark" alt="Checkmark Icon" />
+                <img src="assets/images/icons/error.svg" ng-if="form.name.$touched && form.name.$invalid" class="icon error" alt="Error Icon" />
                 <div ng-if="form.name.$touched && form.name.$invalid" ng-messages='form.name.$error' class='error-messages'>
                     <span ng-message='required' class="error-msg">What's the person's name?</span>
                 </div>
@@ -57,8 +59,8 @@ <h2>Add A Profile</h2>
             <li class="age input-group">
                 <label for="age">Age</label>
                 <input id="age" name="age" type="number" ng-model="vm.refugee.age" pattern="\d*" placeholder="27" required maxlength="3" autocomplete="off" />  <!-- pattern="\d*" makes use of the number keyboard on iOS -->
-                <img src="images/icons/checkmark.svg" ng-if="form.age.$valid" class="icon checkmark" alt="Checkmark Icon" />
-                <img src="images/icons/error.svg" ng-if="form.age.$touched && form.age.$invalid" class="icon error" alt="Error Icon" />
+                <img src="assets/images/icons/checkmark.svg" ng-if="form.age.$valid" class="icon checkmark" alt="Checkmark Icon" />
+                <img src="assets/images/icons/error.svg" ng-if="form.age.$touched && form.age.$invalid" class="icon error" alt="Error Icon" />
                 <div ng-if="form.age.$touched && form.age.$invalid" ng-messages='form.age.$error' class='error-messages'>
                     <span ng-message='required' class="error-msg">How old is the person?</span>
                     <span ng-message='maxlength' class="error-msg">Please enter as a number with max. 3 digits</span>
@@ -68,8 +70,8 @@ <h2>Add A Profile</h2>
             <li class="hometown input-group">
                 <label for="hometown">Hometown</label>
                 <input id="hometown" name="hometown" type="text" ng-model="vm.refugee.homeTown" placeholder="Aleppo" required autocomplete="off" />
-                <img src="images/icons/checkmark.svg" ng-if="form.hometown.$valid" class="icon checkmark" alt="Checkmark Icon" />
-                <img src="images/icons/error.svg" ng-if="form.hometown.$touched && form.hometown.$invalid" class="icon error" alt="Error Icon" />
+                <img src="assets/images/icons/checkmark.svg" ng-if="form.hometown.$valid" class="icon checkmark" alt="Checkmark Icon" />
+                <img src="assets/images/icons/error.svg" ng-if="form.hometown.$touched && form.hometown.$invalid" class="icon error" alt="Error Icon" />
                 <div ng-if="form.hometown.$touched && form.hometown.$invalid" ng-messages='form.hometown.$error' class='error-messages'>
                     <span ng-message='required' class="error-msg">What's the person's home town? If not known, just write 'Unknown'.</span>
                 </div>
@@ -78,8 +80,8 @@ <h2>Add A Profile</h2>
             <li class="country input-group">
                 <label for="country">Home Country</label>
                 <input id="country" name="homecountry" type="text" ng-model="vm.refugee.homeCountry" placeholder="Syria" required autocomplete="off" />
-                <img src="images/icons/checkmark.svg" ng-if="form.homecountry.$valid" class="icon checkmark" alt="Checkmark Icon" />
-                <img src="images/icons/error.svg" ng-if="form.homecountry.$touched && form.homecountry.$invalid" class="icon error" alt="Error Icon" />
+                <img src="assets/images/icons/checkmark.svg" ng-if="form.homecountry.$valid" class="icon checkmark" alt="Checkmark Icon" />
+                <img src="assets/images/icons/error.svg" ng-if="form.homecountry.$touched && form.homecountry.$invalid" class="icon error" alt="Error Icon" />
                 <div ng-if="form.homecountry.$touched && form.homecountry.$invalid" ng-messages='form.homecountry.$error' class='error-messages'>
                     <span ng-message='required' class="error-msg">What's the person's home country?</span>
                 </div>
@@ -88,8 +90,8 @@ <h2>Add A Profile</h2>
             <li class="current-city input-group">
                 <label for="current-city">Current City</label>
                 <input id="current-city" name="currentcity" type="text" ng-model="vm.refugee.currentCity" placeholder="Berlin" required autocomplete="off" />
-                <img src="images/icons/checkmark.svg" ng-if="form.currentcity.$valid" class="icon checkmark" alt="Checkmark Icon" />
-                <img src="images/icons/error.svg" ng-if="form.currentcity.$touched && form.currentcity.$invalid" class="icon error" alt="Error Icon" />
+                <img src="assets/images/icons/checkmark.svg" ng-if="form.currentcity.$valid" class="icon checkmark" alt="Checkmark Icon" />
+                <img src="assets/images/icons/error.svg" ng-if="form.currentcity.$touched && form.currentcity.$invalid" class="icon error" alt="Error Icon" />
                 <div ng-if="form.currentcity.$touched && form.currentcity.$invalid" ng-messages='form.currentcity.$error' class='error-messages'>
                     <span ng-message='required' class="error-msg">What's the person's current city of residence?</span>
                 </div>
@@ -98,8 +100,8 @@ <h2>Add A Profile</h2>
             <li class="current-country input-group">
                 <label for="current-country">Current Country</label>
                 <input id="current-country" name="currentcountry" type="text" ng-model="vm.refugee.currentCountry" placeholder="Germany" required autocomplete="off" />
-                <img src="images/icons/checkmark.svg" ng-if="form.currentcountry.$valid" class="icon checkmark" alt="Checkmark Icon" />
-                <img src="images/icons/error.svg" ng-if="form.currentcountry.$touched && form.currentcountry.$invalid" class="icon error" alt="Error Icon" />
+                <img src="assets/images/icons/checkmark.svg" ng-if="form.currentcountry.$valid" class="icon checkmark" alt="Checkmark Icon" />
+                <img src="assets/images/icons/error.svg" ng-if="form.currentcountry.$touched && form.currentcountry.$invalid" class="icon error" alt="Error Icon" />
                 <div ng-if="form.currentcountry.$touched && form.currentcountry.$invalid" ng-messages='form.currentcountry.$error' class='error-messages'>
                     <span ng-message='required' class="error-msg">What's the person's current country of residence?</span>
                 </div>
@@ -108,8 +110,8 @@ <h2>Add A Profile</h2>
             <li class="who-are-you input-group textarea">
                 <label for="who-are-you">Who are you?</label>
                 <textarea msd-elastic id="who-are-you" name="whoareyou" rows="4" ng-model="vm.refugee.story.whoAreYou" placeholder="I was born and raised in Aleppo, a big city in North-West Syria where I've lived my entire live. After high school I met my husband and…" required></textarea>
-                <img src="images/icons/checkmark.svg" ng-if="form.whoareyou.$valid" class="icon checkmark" alt="Checkmark Icon" />
-                <img src="images/icons/error.svg" ng-if="form.whoareyou.$touched && form.whoareyou.$invalid" class="icon error" alt="Error Icon" />
+                <img src="assets/images/icons/checkmark.svg" ng-if="form.whoareyou.$valid" class="icon checkmark" alt="Checkmark Icon" />
+                <img src="assets/images/icons/error.svg" ng-if="form.whoareyou.$touched && form.whoareyou.$invalid" class="icon error" alt="Error Icon" />
                 <div ng-if="form.whoareyou.$touched && form.whoareyou.$invalid" ng-messages='form.whoareyou.$error' class='error-messages'>
                     <span ng-message='required' class="error-msg">Please provide some background information about the person</span>
                 </div>
@@ -118,8 +120,8 @@ <h2>Add A Profile</h2>
             <li class="why-did-you-leave input-group textarea">
                 <label for="why-did-you-leave">Why did you leave?</label>
                 <textarea msd-elastic id="why-did-you-leave" name="whydidyouleave" rows="4" ng-model="vm.refugee.story.whyDidYouLeave" placeholder="The war began, and everything changed. At first we didn't think it would affect us, but then one day…" required></textarea>
-                <img src="images/icons/checkmark.svg" ng-if="form.whydidyouleave.$valid" class="icon checkmark" alt="Checkmark Icon" />
-                <img src="images/icons/error.svg" ng-if="form.whydidyouleave.$touched && form.whydidyouleave.$invalid" class="icon error" alt="Error Icon" />
+                <img src="assets/images/icons/checkmark.svg" ng-if="form.whydidyouleave.$valid" class="icon checkmark" alt="Checkmark Icon" />
+                <img src="assets/images/icons/error.svg" ng-if="form.whydidyouleave.$touched && form.whydidyouleave.$invalid" class="icon error" alt="Error Icon" />
                 <div ng-if="form.whydidyouleave.$touched && form.whydidyouleave.$invalid" ng-messages='form.whydidyouleave.$error' class='error-messages'>
                     <span ng-message='required' class="error-msg">Why did the person have to leave his or her home country?</span>
                 </div>
@@ -128,8 +130,8 @@ <h2>Add A Profile</h2>
             <li class="how-did-you-travel input-group textarea">
                 <label for="how-did-you-travel">How did you travel?</label>
                 <textarea msd-elastic id="how-did-you-travel" name="howdidyoutravel" rows="4" ng-model="vm.refugee.story.howDidYouTravel" placeholder="We escaped town and found our way to a convoy of cars all going in the same direction. We arrived at the border town and paid a group of people to…" required></textarea>
-                <img src="images/icons/checkmark.svg" ng-if="form.howdidyoutravel.$valid" class="icon checkmark" alt="Checkmark Icon" />
-                <img src="images/icons/error.svg" ng-if="form.howdidyoutravel.$touched && form.howdidyoutravel.$invalid" class="icon error" alt="Error Icon" />
+                <img src="assets/images/icons/checkmark.svg" ng-if="form.howdidyoutravel.$valid" class="icon checkmark" alt="Checkmark Icon" />
+                <img src="assets/images/icons/error.svg" ng-if="form.howdidyoutravel.$touched && form.howdidyoutravel.$invalid" class="icon error" alt="Error Icon" />
                 <div ng-if="form.howdidyoutravel.$touched && form.howdidyoutravel.$invalid" ng-messages='form.howdidyoutravel.$error' class='error-messages'>
                     <span ng-message='required' class="error-msg">How did the person get to his or her current country of residence? Which route did they take? How long was the trip?</span>
                 </div>
@@ -138,8 +140,8 @@ <h2>Add A Profile</h2>
             <li class="what-do-you-wish-for input-group textarea">
                 <label for="what-do-you-wish-for">What do you wish for?</label>
                 <textarea msd-elastic id="what-do-you-wish-for" name="whatdoyouwishfor" rows="4" ng-model="vm.refugee.story.whatDoYouWishFor" placeholder="I hope that one day I will be reunited with my husband, and we will have the third child we always wanted... a boy. I want peace for Syria, and…" required></textarea>
-                <img src="images/icons/checkmark.svg" ng-if="form.whatdoyouwishfor.$valid" class="icon checkmark" alt="Checkmark Icon" />
-                <img src="images/icons/error.svg" ng-if="form.whatdoyouwishfor.$touched && form.whatdoyouwishfor.$invalid" class="icon error" alt="Error Icon" />
+                <img src="assets/images/icons/checkmark.svg" ng-if="form.whatdoyouwishfor.$valid" class="icon checkmark" alt="Checkmark Icon" />
+                <img src="assets/images/icons/error.svg" ng-if="form.whatdoyouwishfor.$touched && form.whatdoyouwishfor.$invalid" class="icon error" alt="Error Icon" />
                 <div ng-if="form.whatdoyouwishfor.$touched && form.whatdoyouwishfor.$invalid" ng-messages='form.whatdoyouwishfor.$error' class='error-messages'>
                     <span ng-message='required' class="error-msg">What does this person wish for in the future?</span>
                 </div>
@@ -148,8 +150,8 @@ <h2>Add A Profile</h2>
             <li class="email input-group">
                 <label for="email">What's the uploader's Email?</label>
                 <input id="email" type="email" name="email" ng-model="vm.refugee.email" placeholder="peter.parker@abc.com" required />
-                <img src="images/icons/checkmark.svg" ng-if="form.email.$valid" class="icon checkmark" alt="Checkmark Icon" />
-                <img src="images/icons/error.svg" ng-if="form.email.$touched && form.email.$invalid" class="icon error" alt="Error Icon" />
+                <img src="assets/images/icons/checkmark.svg" ng-if="form.email.$valid" class="icon checkmark" alt="Checkmark Icon" />
+                <img src="assets/images/icons/error.svg" ng-if="form.email.$touched && form.email.$invalid" class="icon error" alt="Error Icon" />
                 <div ng-if="form.email.$touched && form.email.$invalid" ng-messages='form.email.$error' class='error-messages'>
                     <span ng-message='required' class="error-msg">What is your personal email address?<br><br>In case we have further questions regarding this profile. Don't worry, we will not send you any spam, newsletters or else without your prior agreement ;)</span>
                     <span ng-message='email' class="error-msg">This doesn't look like a valid email address. A typo, maybe?</span>
@@ -159,11 +161,11 @@ <h2>Add A Profile</h2>
             <li class="disclaimer input-group checkbox">
                 <input id="disclaimer" type="checkbox" name="disclaimer" ng-model="vm.refugee.disclaimer" required />
                 <label for="disclaimer">I agree with the <a href="" ng-click="vm.showTerms = !vm.showTerms">Terms &amp; Conditions</a></label>
-                <img src="images/icons/checkmark.svg" ng-if="form.disclaimer.$valid" class="icon checkmark" alt="Checkmark Icon" />
-                <img src="images/icons/error.svg" ng-if="form.disclaimer.$touched && form.disclaimer.$invalid" class="icon error" alt="Error Icon" />
+                <img src="assets/images/icons/checkmark.svg" ng-if="form.disclaimer.$valid" class="icon checkmark" alt="Checkmark Icon" />
+                <img src="assets/images/icons/error.svg" ng-if="form.disclaimer.$touched && form.disclaimer.$invalid" class="icon error" alt="Error Icon" />
                 <p class="terms" ng-show="vm.showTerms">
-                    I hereby grant WalkWithMe.berlin the right and permission to use any images and text I upload.
-                    I declare that I am the owner of any images and text I upload, and that I have permission to upload it for the purposes described here.
+                    I hereby grant WalkWithMe.berlin the right and permission to use any assets/images and text I upload.
+                    I declare that I am the owner of any assets/images and text I upload, and that I have permission to upload it for the purposes described here.
                     <br>
                     <br>
                     I understand that WalkWithMe.berlin may use, re-use, publish and re-publish my content in whole or in part, in any medium now or hereafter known, and for any purpose whatsoever.
diff --git a/src/sections/home.html b/src/sections/home.html
index 9d39b07..441421e 100644
--- a/src/sections/home.html
+++ b/src/sections/home.html
@@ -1,4 +1,4 @@
 <section id="home">
-    <header><img ui-sref="home" src="images/walk-with-me-logo.png" alt="Walk With Me: Berlin" title="Walk With Me: Berlin" width="230"/></header>
+    <header><img ui-sref="home" src="assets/images/walk-with-me-logo.png" alt="Walk With Me: Berlin" title="Walk With Me: Berlin" width="230"/></header>
     <age-form></age-form>
 </section>
diff --git a/src/sections/journey.html b/src/sections/journey.html
index 1db82c4..20db763 100644
--- a/src/sections/journey.html
+++ b/src/sections/journey.html
@@ -1,7 +1,7 @@
 <section id="journey">
     <header>
         <div class="header-logo">
-            <p class="sub-image"><img src="images/h1-walk-with.png" alt="Walk with"/></p>
+            <p class="sub-image"><img src="assets/images/h1-walk-with.png" alt="Walk with"/></p>
             <h1>
                 <span ng-bind="vm.refugee.name"></span>,
                 <span ng-bind="vm.refugee.age"></span>
@@ -18,7 +18,7 @@ <h1>
                 &rarr;
                 <span ng-bind="vm.refugee.currentCity"></span>
             </p>
-            <img class="route-map" ng-src="images/journey/{{vm.refugee.mapUrl}}" alt="{{vm.refugee.homeTown}} to {{vm.refugee.currentCity}}"/>
+            <img class="route-map" ng-src="assets/images/journey/{{vm.refugee.mapUrl}}" alt="{{vm.refugee.homeTown}} to {{vm.refugee.currentCity}}"/>
         </div>
     </header>
 
@@ -30,7 +30,7 @@ <h1>
     </div>
 
     <article class="card">
-        <h2 class="sub-image"><img src="images/h1-my-story.png" alt="My story"/></h2>
+        <h2 class="sub-image"><img src="assets/images/h1-my-story.png" alt="My story"/></h2>
         <div ng-bind-html="vm.refugee.story.whoAreYou"></div>
 
         <h2>Why did you leave?</h2>
diff --git a/src/sections/profileAdded.html b/src/sections/profileAdded.html
index 0daecc9..bd00ac6 100644
--- a/src/sections/profileAdded.html
+++ b/src/sections/profileAdded.html
@@ -1,6 +1,6 @@
 <section id="profile-added">
     <header>
-        <img ui-sref="home" src="images/walk-with-me-logo.png" alt="Walk With Me: Berlin" title="Walk With Me: Berlin" width="230"/>
+        <img ui-sref="home" src="assets/images/walk-with-me-logo.png" alt="Walk With Me: Berlin" title="Walk With Me: Berlin" width="230"/>
     </header>
 
     <p class="success-message">
diff --git a/src/styles/sections/addProfile.scss b/src/styles/sections/addProfile.scss
index 8f34052..0636703 100644
--- a/src/styles/sections/addProfile.scss
+++ b/src/styles/sections/addProfile.scss
@@ -1,10 +1,10 @@
 #add-profile {
-  background: transparent url('../images/bg-mobile.jpg') center center no-repeat fixed;
+  background: transparent url('../assets/images/bg-mobile.jpg') center center no-repeat fixed;
   background-size: cover;
   padding: 1rem;
 
   @media(min-width: $layout-s) {
-    background-image: url('../images/bg-web.jpg');
+    background-image: url('../assets/images/bg-web.jpg');
   }
 
   h2 {
diff --git a/src/styles/sections/home.scss b/src/styles/sections/home.scss
index ab58f77..fc5af24 100644
--- a/src/styles/sections/home.scss
+++ b/src/styles/sections/home.scss
@@ -1,11 +1,11 @@
 #home {
-  background: transparent url('../images/bg-mobile.jpg') center center no-repeat;
+  background: transparent url('../assets/images/bg-mobile.jpg') center center no-repeat;
   background-size: cover;
   padding: 1rem;
   position: relative;
 
   @media(min-width: 768px) {
-    background-image: url('../images/bg-web.jpg');
+    background-image: url('../assets/images/bg-web.jpg');
   }
 
   .age-form {
diff --git a/src/styles/sections/journey.scss b/src/styles/sections/journey.scss
index c466268..16964ad 100644
--- a/src/styles/sections/journey.scss
+++ b/src/styles/sections/journey.scss
@@ -47,7 +47,7 @@ $map-height: 460px;
 
     &::after {
       content: "";
-      background: transparent url('../images/grunge-over-image.png') left bottom no-repeat;
+      background: transparent url('../assets/images/grunge-over-image.png') left bottom no-repeat;
       top: 0;
       left: 0;
       bottom: 0;
@@ -112,7 +112,7 @@ $map-height: 460px;
   }
 
   article {
-    background: transparent url('../images/grunge-white-top.jpg') left -55px no-repeat;
+    background: transparent url('../assets/images/grunge-white-top.jpg') left -55px no-repeat;
     line-height: 1.5;
     max-width: $content-max-width;
     padding: 2rem;
diff --git a/src/styles/sections/profileAdded.scss b/src/styles/sections/profileAdded.scss
index 8ca4120..678e27c 100644
--- a/src/styles/sections/profileAdded.scss
+++ b/src/styles/sections/profileAdded.scss
@@ -1,11 +1,11 @@
 #profile-added {
-  background: transparent url('../images/bg-mobile.jpg') center center no-repeat;
+  background: transparent url('../assets/images/bg-mobile.jpg') center center no-repeat;
   background-size: cover;
   padding: 1rem;
   position: relative;
 
   @media(min-width: $layout-s) {
-    background-image: url('../images/bg-web.jpg');
+    background-image: url('../assets/images/bg-web.jpg');
   }
 
   .success-message {