diff --git a/bower.json b/bower.json
index ea32d33..b109325 100644
--- a/bower.json
+++ b/bower.json
@@ -2,8 +2,8 @@
   "name": "chocolat",
   "version": "0.4.7",
   "main": [
-    "css/chocolat.css",
-    "js/jquery.chocolat.js"
+    "dist/css/chocolat.css",
+    "dist/js/jquery.chocolat.js"
   ],
   "license": "CC-BY-2.0",
   "dependencies": {
diff --git a/css/chocolat.css b/dist/css/chocolat.css
similarity index 100%
rename from css/chocolat.css
rename to dist/css/chocolat.css
diff --git a/demo-images/1.jpg b/dist/demo-images/1.jpg
similarity index 100%
rename from demo-images/1.jpg
rename to dist/demo-images/1.jpg
diff --git a/demo-images/2.jpg b/dist/demo-images/2.jpg
similarity index 100%
rename from demo-images/2.jpg
rename to dist/demo-images/2.jpg
diff --git a/demo-images/3.jpg b/dist/demo-images/3.jpg
similarity index 100%
rename from demo-images/3.jpg
rename to dist/demo-images/3.jpg
diff --git a/demo-images/4.jpg b/dist/demo-images/4.jpg
similarity index 100%
rename from demo-images/4.jpg
rename to dist/demo-images/4.jpg
diff --git a/demo-images/5.jpg b/dist/demo-images/5.jpg
similarity index 100%
rename from demo-images/5.jpg
rename to dist/demo-images/5.jpg
diff --git a/demo-images/6.jpg b/dist/demo-images/6.jpg
similarity index 100%
rename from demo-images/6.jpg
rename to dist/demo-images/6.jpg
diff --git a/demo-images/7.jpg b/dist/demo-images/7.jpg
similarity index 100%
rename from demo-images/7.jpg
rename to dist/demo-images/7.jpg
diff --git a/demo-images/8.jpg b/dist/demo-images/8.jpg
similarity index 100%
rename from demo-images/8.jpg
rename to dist/demo-images/8.jpg
diff --git a/images/close.png b/dist/images/close.png
similarity index 100%
rename from images/close.png
rename to dist/images/close.png
diff --git a/images/fullscreen.png b/dist/images/fullscreen.png
similarity index 100%
rename from images/fullscreen.png
rename to dist/images/fullscreen.png
diff --git a/images/left.png b/dist/images/left.png
similarity index 100%
rename from images/left.png
rename to dist/images/left.png
diff --git a/images/loader.gif b/dist/images/loader.gif
similarity index 100%
rename from images/loader.gif
rename to dist/images/loader.gif
diff --git a/images/right.png b/dist/images/right.png
similarity index 100%
rename from images/right.png
rename to dist/images/right.png
diff --git a/index.html b/dist/index.html
similarity index 89%
rename from index.html
rename to dist/index.html
index 9166987..583b58d 100644
--- a/index.html
+++ b/dist/index.html
@@ -2,9 +2,9 @@
 <html>
     <head>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="css/chocolat.css" />
+        <link rel="stylesheet" href="./css/chocolat.css" />
         <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
-        <script type="text/javascript" src="js/jquery.chocolat.js"></script>
+        <script type="text/javascript" src="./js/jquery.chocolat.js"></script>
         <style>
             body {
                 text-align: center;
@@ -145,65 +145,65 @@ <h2>
                 $('.api-open').on('click', function(e) {
                     e.preventDefault()
 
-                    console.debug('open start');
+                    console.log('open start');
                     var def = instance.api().open()
 
                     def.done(function(){
-                        console.debug('open done');
+                        console.log('open done');
                     })
                 })
                 $('.api-close').on('click', function(e) {
                     e.preventDefault()
 
-                    console.debug('close start');
+                    console.log('close start');
                     var def = instance.api().close()
 
                     def.done(function(){
-                        console.debug('close done');
+                        console.log('close done');
                     })
                 })
                 $('.api-prev').on('click', function(e) {
                     e.preventDefault()
 
-                    console.debug('prev start');
+                    console.log('prev start');
                     var def = instance.api().prev()
 
                     def.done(function(){
-                        console.debug('prev done');
+                        console.log('prev done');
                     })
                 })
                 $('.api-next').on('click', function(e) {
                     e.preventDefault()
 
-                    console.debug('next start');
+                    console.log('next start');
                     var def = instance.api().next()
 
                     def.done(function(){
-                        console.debug('next done');
+                        console.log('next done');
                     })
                 })
 
                 $('.api-cover').on('click', function(e) {
                     e.preventDefault()
 
-                    console.debug('cover mode start')
+                    console.log('cover mode start')
                     instance.api().set('fullWindow', 'cover')
                     var def = instance.api().place()
 
                     def.done(function(){
-                        console.debug('cover mode done')
+                        console.log('cover mode done')
                     })
                 })
 
                 $('.api-contain').on('click', function(e) {
                     e.preventDefault()
 
-                    console.debug('contain mode start')
+                    console.log('contain mode start')
                     instance.api().set('fullWindow', 'contain')
                     var def = instance.api().place()
 
                     def.done(function(){
-                        console.debug('contain mode done')
+                        console.log('contain mode done')
                     })
                 })
             });
diff --git a/js/jquery.chocolat.js b/dist/js/jquery.chocolat.js
similarity index 99%
rename from js/jquery.chocolat.js
rename to dist/js/jquery.chocolat.js
index 1f63501..2efbe74 100644
--- a/js/jquery.chocolat.js
+++ b/dist/js/jquery.chocolat.js
@@ -1,10 +1,3 @@
-﻿/*
-**      @author : Nicolas Turlais : nicolas-at-insipi.de
-**      @version : V0.4.6 - 4th of July 2015
-**      @license : Licensed under CCAttribution-ShareAlike
-**      @website : http://chocolat.insipi.de
-*/
-
 ; (function($, window, document, undefined) {
     var calls = 0;
     var defaults = {
diff --git a/dist/js/jquery.chocolat.min.js b/dist/js/jquery.chocolat.min.js
new file mode 100644
index 0000000..3636321
--- /dev/null
+++ b/dist/js/jquery.chocolat.min.js
@@ -0,0 +1 @@
+!function(t,e,i,s){function n(e,i){var s=this;return this.settings=i,this._defaults=l,this.elems={},!this.settings.setTitle&&e.data("chocolat-title")&&(this.settings.setTitle=e.data("chocolat-title")),e.find(this.settings.imageSelector).each(function(){s.settings.images.push({title:t(this).attr("title"),src:t(this).attr("href"),height:!1,width:!1})}),e.find(this.settings.imageSelector).each(function(e){t(this).off("click").on("click",function(t){s.init(e),t.preventDefault()})}),this}var o=0,l={container:e,imageSelector:".chocolat-image",className:"",fullWindow:!1,initialZoomState:null,fullScreen:!1,loop:!1,linkImages:!0,duration:300,setTitle:"",separator2:"/",setIndex:0,firstImage:0,lastImage:!1,currentImage:!1,initialized:!1,timer:!1,timerDebounce:!1,images:[]};t.extend(n.prototype,{init:function(t){return this.settings.initialized||(this.setDomContainer(),this.markup(),this.events(),this.settings.lastImage=this.settings.images.length-1,this.settings.initialized=!0),this.load(t)},preload:function(e){var i=t.Deferred();if("undefined"!=typeof this.settings.images[e]){var s=new Image;return s.onload=function(){i.resolve(s)},s.src=this.settings.images[e].src,i}},load:function(e){var i=this;if(this.settings.fullScreen&&this.openFullScreen(),this.settings.currentImage!==e){this.elems.overlay.fadeIn(800),this.settings.timer=setTimeout(function(){"undefined"!=typeof i.elems&&t.proxy(i.elems.loader.fadeIn(),i)},800);var s=this.preload(e).then(function(t){return i.place(e,t)}).then(function(t){return i.appear(e)}).then(function(t){i.zoomable()}),n=e+1;return"undefined"!=typeof this.settings.images[n]&&this.preload(n),s}},place:function(t,e){var i=this;return this.settings.currentImage=t,this.description(),this.pagination(),this.arrows(),this.storeImgSize(e,t),fitting=this.fit(t,i.settings.container),this.center(fitting.width,fitting.height,fitting.left,fitting.top,0)},center:function(t,e,i,s,n){return this.elems.content.css("overflow","visible").animate({width:t,height:e,left:i,top:s},n).promise()},appear:function(t){var e=this;clearTimeout(this.settings.timer),this.elems.loader.stop().fadeOut(300,function(){e.elems.img.attr("src",e.settings.images[t].src)})},fit:function(e,i){var s=this.settings.images[e].height,n=this.settings.images[e].width,o=t(i).height(),l=t(i).width(),a=this.getOutMarginH(),h=this.getOutMarginW(),r=l-h,c=o-a,g=c/r,m=o/l,u=s/n;return"cover"==this.settings.fullWindow?m>u?(height=o,width=height/u):(width=l,height=width*u):"native"==this.settings.fullWindow?(height=s,width=n):(u>g?(height=c,width=height/u):(width=r,height=width*u),!this.settings.fullWindow&&(width>=n||height>=s)&&(width=n,height=s)),{height:height,width:width,top:(o-height)/2,left:(l-width)/2}},change:function(t){this.zoomOut(0),this.zoomable();var e=this.settings.currentImage+parseInt(t);if(e>this.settings.lastImage){if(this.settings.loop)return this.load(0)}else{if(!(0>e))return this.load(e);if(this.settings.loop)return this.load(this.settings.lastImage)}},arrows:function(){this.settings.loop?t([this.elems.left[0],this.elems.right[0]]).addClass("active"):this.settings.linkImages?(this.settings.currentImage==this.settings.lastImage?this.elems.right.removeClass("active"):this.elems.right.addClass("active"),0==this.settings.currentImage?this.elems.left.removeClass("active"):this.elems.left.addClass("active")):t([this.elems.left[0],this.elems.right[0]]).removeClass("active")},description:function(){var t=this;this.elems.description.html(t.settings.images[t.settings.currentImage].title)},pagination:function(){var t=this,e=this.settings.lastImage+1,i=this.settings.currentImage+1;this.elems.pagination.html(i+" "+t.settings.separator2+e)},storeImgSize:function(t,e){"undefined"!=typeof t&&(this.settings.images[e].height&&this.settings.images[e].width||(this.settings.images[e].height=t.height,this.settings.images[e].width=t.width))},close:function(){if(this.settings.fullscreenOpen)return void this.exitFullScreen();var e=[this.elems.overlay[0],this.elems.loader[0],this.elems.wrapper[0]],i=this,s=t.when(t(e).fadeOut(200)).done(function(){i.elems.domContainer.removeClass("chocolat-open chocolat-mobile chocolat-in-container chocolat-cover")});return this.settings.currentImage=!1,this.settings.initialized=!1,s},getOutMarginW:function(){var t=this.elems.left.outerWidth(),e=this.elems.right.outerWidth();return t+e},getOutMarginH:function(){return this.elems.top.outerHeight()+this.elems.bottom.outerHeight()},markup:function(){this.elems.domContainer.addClass("chocolat-open "+this.settings.className),"cover"==this.settings.fullWindow&&this.elems.domContainer.addClass("chocolat-cover"),this.settings.container!==e&&this.elems.domContainer.addClass("chocolat-in-container");this.elems.wrapper=t("<div/>",{"class":"chocolat-wrapper"}).appendTo(this.elems.domContainer),this.elems.overlay=t("<div/>",{"class":"chocolat-overlay"}).appendTo(this.elems.wrapper),this.elems.loader=t("<div/>",{"class":"chocolat-loader"}).appendTo(this.elems.wrapper),this.elems.content=t("<div/>",{"class":"chocolat-content",id:"chocolat-content-"+this.settings.setIndex}).appendTo(this.elems.wrapper),this.elems.img=t("<img/>",{"class":"chocolat-img",src:""}).appendTo(this.elems.content),this.elems.top=t("<div/>",{"class":"chocolat-top"}).appendTo(this.elems.wrapper),this.elems.left=t("<div/>",{"class":"chocolat-left"}).appendTo(this.elems.wrapper),this.elems.right=t("<div/>",{"class":"chocolat-right"}).appendTo(this.elems.wrapper),this.elems.bottom=t("<div/>",{"class":"chocolat-bottom"}).appendTo(this.elems.wrapper),this.elems.fullscreen=t("<span/>",{"class":"chocolat-fullscreen"}).appendTo(this.elems.bottom),this.elems.description=t("<span/>",{"class":"chocolat-description"}).appendTo(this.elems.bottom),this.elems.pagination=t("<span/>",{"class":"chocolat-pagination"}).appendTo(this.elems.bottom),this.elems.setTitle=t("<span/>",{"class":"chocolat-set-title",html:this.settings.setTitle}).appendTo(this.elems.bottom),this.elems.close=t("<span/>",{"class":"chocolat-close"}).appendTo(this.elems.top)},openFullScreen:function(){var t=this.elems.wrapper[0];t.requestFullscreen?(this.settings.fullscreenOpen=!0,t.requestFullscreen()):t.mozRequestFullScreen?(this.settings.fullscreenOpen=!0,t.mozRequestFullScreen()):t.webkitRequestFullscreen?(this.settings.fullscreenOpen=!0,t.webkitRequestFullscreen()):t.msRequestFullscreen?(t.msRequestFullscreen(),this.settings.fullscreenOpen=!0):this.settings.fullscreenOpen=!1},exitFullScreen:function(){i.exitFullscreen?(i.exitFullscreen(),this.settings.fullscreenOpen=!1):i.mozCancelFullScreen?(i.mozCancelFullScreen(),this.settings.fullscreenOpen=!1):i.webkitExitFullscreen?(i.webkitExitFullscreen(),this.settings.fullscreenOpen=!1):this.settings.fullscreenOpen=!0},events:function(){var s=this;t(i).off("keydown.chocolat").on("keydown.chocolat",function(t){s.settings.initialized&&(37==t.keyCode?s.change(-1):39==t.keyCode?s.change(1):27==t.keyCode&&s.close())}),this.elems.wrapper.find(".chocolat-right").off("click.chocolat").on("click.chocolat",function(){s.change(1)}),this.elems.wrapper.find(".chocolat-left").off("click.chocolat").on("click.chocolat",function(){return s.change(-1)}),t([this.elems.overlay[0],this.elems.close[0]]).off("click.chocolat").on("click.chocolat",function(){return s.close()}),this.elems.fullscreen.off("click.chocolat").on("click.chocolat",function(){return s.settings.fullscreenOpen?void s.exitFullScreen():void s.openFullScreen()}),s.settings.backgroundClose&&this.elems.overlay.off("click.chocolat").on("click.chocolat",function(){return s.close()}),this.elems.wrapper.find(".chocolat-img").off("click.chocolat").on("click.chocolat",function(t){return null===s.settings.initialZoomState&&s.elems.domContainer.hasClass("chocolat-zoomable")?s.zoomIn(t):s.zoomOut(t)}),this.elems.wrapper.mousemove(function(e){if(null!==s.settings.initialZoomState&&!s.elems.img.is(":animated")){var i=t(this).offset(),n=t(this).height(),o=t(this).width(),l=s.settings.images[s.settings.currentImage],a=l.width,h=l.height,r=[e.pageX-o/2-i.left,e.pageY-n/2-i.top],c=0;a>o&&(c=r[0]/(o/2),c=(a-o+0)/2*c);var g=0;h>n&&(g=r[1]/(n/2),g=(h-n+0)/2*g);var m={"margin-left":-c+"px","margin-top":-g+"px"};"undefined"!=typeof e.duration?t(s.elems.img).stop(!1,!0).animate(m,e.duration):t(s.elems.img).stop(!1,!0).css(m)}}),t(e).on("resize",function(){s.settings.initialized&&s.debounce(50,function(){fitting=s.fit(s.settings.currentImage,s.settings.container),s.center(fitting.width,fitting.height,fitting.left,fitting.top,0),s.zoomable()})})},zoomable:function(){var t=this.settings.images[this.settings.currentImage],e=this.elems.wrapper.width(),i=this.elems.wrapper.height(),s=t.width>e||t.height>i,n=this.elems.img.width()>t.width||this.elems.img.height()>t.height;s&&!n?this.elems.domContainer.addClass("chocolat-zoomable"):this.elems.domContainer.removeClass("chocolat-zoomable")},zoomIn:function(e){this.settings.initialZoomState=this.settings.fullWindow,this.settings.fullWindow="native";var i=t.Event("mousemove");return i.pageX=e.pageX,i.pageY=e.pageY,i.duration=this.settings.duration,this.elems.wrapper.trigger(i),this.elems.domContainer.addClass("chocolat-zoomed"),fitting=this.fit(this.settings.currentImage,this.settings.container),this.center(fitting.width,fitting.height,fitting.left,fitting.top,this.settings.duration)},zoomOut:function(t,e){if(null!==this.settings.initialZoomState){var e=e||this.settings.duration;return this.settings.fullWindow=this.settings.initialZoomState,this.settings.initialZoomState=null,this.elems.img.animate({margin:0},e),this.elems.domContainer.removeClass("chocolat-zoomed"),fitting=this.fit(this.settings.currentImage,this.settings.container),this.center(fitting.width,fitting.height,fitting.left,fitting.top,e)}},setDomContainer:function(){this.elems.domContainer=t(this.settings.container===e?"body":this.settings.container)},debounce:function(t,e){clearTimeout(this.settings.timerDebounce),this.settings.timerDebounce=setTimeout(function(){e()},t)},api:function(){var t=this;return{open:function(e){return e=parseInt(e)||0,t.init(e)},close:function(){return t.close()},next:function(){return t.change(1)},prev:function(){return t.change(-1)},"goto":function(e){return t.open(e)},current:function(){return t.settings.currentImage},place:function(){return t.place(t.settings.currentImage,t.settings.duration)},set:function(e,i){return t.settings[e]=i},get:function(e){return t.settings[e]},getElem:function(e){return t.elems[e]}}}}),t.fn.Chocolat=function(e){return this.each(function(){o++;var i=t.extend(!0,{},l,e,{setIndex:o});t.data(this,"chocolat")||t.data(this,"chocolat",new n(t(this),i))})}}(jQuery,window,document);
\ No newline at end of file
diff --git a/gulpfile.coffee b/gulpfile.coffee
index 06a460f..5780578 100644
--- a/gulpfile.coffee
+++ b/gulpfile.coffee
@@ -1,33 +1,58 @@
 gulp = require 'gulp'
 gutil = require 'gulp-util'
+rename = require('gulp-rename');
+uglify = require 'gulp-uglify'
 coffee = require 'gulp-coffee'
 bump = require 'gulp-bump'
-mochaPhantomJS = require('gulp-mocha-phantomjs')
+mochaPhantomJS = require 'gulp-mocha-phantomjs'
 
 gulp.task 'compile-coffee', ->
-    gulp.src './test/src/*.coffee'
+    gulp.src './test/*.coffee'
         .pipe coffee({bare: true}).on('error', gutil.log)
         .pipe gulp.dest './test/'
 
-gulp.task 'watch',->
-    gulp.watch(['./test/src/*.coffee'], ['compile-coffee', 'testing'])
-
 gulp.task 'testing', ->
     gulp.src('./test/index.html')
     .pipe(mochaPhantomJS());
 
-gulp.task 'default', [
-    'compile-coffee'
-    'watch'
-]
+gulp.task 'build-js', ->
+    gulp.src('./src/js/jquery.chocolat.js')
+    .pipe gulp.dest('./dist/js/')
+    .pipe(rename('jquery.chocolat.min.js'))
+    .pipe(uglify())
+    .pipe gulp.dest('./dist/js/')
+
+gulp.task 'build-css', ->
+    gulp.src('./src/css/chocolat.css')
+    .pipe gulp.dest('./dist/css/')
+
+gulp.task 'build-images', ->
+    gulp.src('./src/images/*')
+    .pipe gulp.dest('./dist/images/')
 
 gulp.task 'bump', ->
     gulp.src(['./package.json', './bower.json'])
     .pipe(bump())
     .pipe gulp.dest('./')
 
+gulp.task 'watch-test',->
+    gulp.watch(['./test/*.coffee', './src/js/*.js', './src/css/*.css'], ['build', 'compile-coffee', 'testing'])
+
+gulp.task 'watch-src',->
+    gulp.watch(['./src/js/*.js', './src/css/*.css'], ['build-js', 'build-css'])
+
 gulp.task 'test', [
+    'build'
     'compile-coffee'
     'testing'
-    'watch'
+    'watch-test'
+]
+gulp.task 'build', [
+    'build-js'
+    'build-css'
+    'build-images'
+]
+gulp.task 'default', [
+    'build'
+    'watch-src'
 ]
\ No newline at end of file
diff --git a/package.json b/package.json
index 25bc090..c23d625 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,8 @@
     "gulp-bump": "^0.3.1",
     "gulp-coffee": "^2.3.1",
     "gulp-mocha-phantomjs": "^0.6.1",
+    "gulp-rename": "^1.2.2",
+    "gulp-uglify": "^1.2.0",
     "gulp-util": "^3.0.6"
   },
   "scripts": {
diff --git a/readme.md b/readme.md
index 09aa147..8b4b4e3 100644
--- a/readme.md
+++ b/readme.md
@@ -1,6 +1,7 @@
 ##Chocolat [![Build Status](https://travis-ci.org/nicolas-t/Chocolat.svg?branch=master)](https://travis-ci.org/nicolas-t/Chocolat) 
 -----------
-Chocolat is a responsive jQuery lightbox plugin
+Chocolat is a responsive jQuery lightbox plugin  
+What you are looking for is in the `/dist/` folder`. 
 
 #### Dependencies
 
diff --git a/src/css/chocolat.css b/src/css/chocolat.css
new file mode 100644
index 0000000..3991176
--- /dev/null
+++ b/src/css/chocolat.css
@@ -0,0 +1,235 @@
+/*
+    CSS RESET
+*/
+
+html, body, div, span{
+    margin: 0;
+    padding: 0;
+    border: 0;
+    vertical-align: baseline;
+}
+.chocolat-zoomable.chocolat-zoomed .chocolat-img{
+    cursor : zoom-out;
+}
+.chocolat-open{
+    overflow: hidden;
+}
+.chocolat-overlay{
+    height:100%;
+    width:100%;
+    position:fixed;
+    left:0;
+    top:0;
+    z-index:10;
+    background-color:#fff;
+    display:none;
+    opacity: 0.8;
+}
+.chocolat-wrapper{
+    height:100%;
+    width:100%;
+    position:fixed;
+    left:0;
+    top:0;
+    z-index:16;
+    color: #fff;
+}
+.chocolat-zoomable .chocolat-img{
+    cursor : zoom-in;
+}
+.chocolat-loader{
+    height:32px;
+    width:32px;
+    position:absolute;
+    left:50%;
+    top:50% ;
+    margin-left:-16px;
+    margin-top:-16px;
+    z-index:11;
+    background:url(../images/loader.gif);
+    display:none;
+}
+.chocolat-content{
+    position:fixed;
+    width:0px;
+    height:0px;
+    left:50%;
+    top:50%;
+    z-index:14;
+    text-align: left;
+}
+
+.chocolat-content .chocolat-img{
+    position:absolute;
+    width:100%;
+    height:100%;
+}
+.chocolat-wrapper .chocolat-left{
+    position:absolute;
+    left:0;
+    width:50px;
+    height:100px;
+    top: 50%;
+    margin-top: -50px;
+    cursor:pointer;
+    background:url(../images/left.png) 50% 50% no-repeat;
+    z-index: 17;
+    display: none;
+
+}
+.chocolat-wrapper .chocolat-right{
+    position:absolute;
+    right:0;
+    width:50px;
+    height:100px;
+    top: 50%;
+    margin-top: -50px;
+    cursor:pointer;
+    background:url(../images/right.png)  50% 50% no-repeat;
+    z-index: 17;
+    display: none;
+}
+.chocolat-wrapper .chocolat-right.active{
+    display: block;
+}
+.chocolat-wrapper .chocolat-left.active{
+    display: block;
+}
+.chocolat-wrapper .chocolat-top{
+    position:absolute;
+    top:0px;
+    right: 0;
+    left: 0;
+    line-height:50px;
+    height:50px;
+    overflow: hidden;
+    z-index: 17;
+}
+.chocolat-wrapper .chocolat-close{
+    width:50px;
+    height:50px;
+    cursor:pointer;
+    position: absolute;
+    top: 0;
+    right: 0;
+    background:url(../images/close.png) 50% 50% no-repeat;
+}
+.chocolat-wrapper .chocolat-bottom{
+    position:absolute;
+    bottom:0;
+    left: 0;
+    right: 0;
+    line-height:50px;
+    height:50px;
+    font-size:12px;
+    z-index: 17;
+    padding-left: 15px;
+    padding-right: 15px;
+    background: rgba(0, 0, 0, 0.2);
+    text-align: right;
+}
+.chocolat-wrapper .chocolat-set-title{
+    display: inline-block;
+    padding-right: 15px;
+    line-height: 1;
+    border-right: 1px solid rgba(255, 255, 255, 0.3);
+}
+.chocolat-wrapper .chocolat-pagination{
+    float: right;
+    display: inline-block;
+    padding-left: 15px;
+    padding-right: 15px;
+    margin-right: 15px;
+    /*border-right: 1px solid rgba(255, 255, 255, 0.2);*/
+}
+.chocolat-wrapper .chocolat-fullscreen{
+    width: 16px;
+    height: 50px;
+    background: url(../images/fullscreen.png) 50% 50% no-repeat;
+    display: block;
+    margin:auto;
+    cursor: pointer;
+    float: right;
+}
+.chocolat-wrapper .chocolat-description{
+    display: inline-block;
+    float: left;
+}
+
+/* compact view */
+.chocolat-cover .chocolat-content .chocolat-left,
+.chocolat-cover .chocolat-content .chocolat-right{
+    position: fixed;
+    height: 100%;
+    top: 0;
+    padding: 0px;
+}
+.chocolat-cover .chocolat-content .chocolat-right{
+    right:0px;
+    background:url(../images/right-compact.png) 100% 50% no-repeat;
+}
+.chocolat-cover .chocolat-content .chocolat-left{
+    left:0;
+    background:url(../images/left-compact.png) 0% 50% no-repeat;
+}
+.chocolat-cover .chocolat-content .chocolat-top{
+    top: 0;
+    left: 0;
+    position: fixed;
+    z-index: 1;
+}
+.chocolat-cover .chocolat-content .chocolat-close{
+    background:url(../images/close-compact.png) 0% center no-repeat;
+}
+.chocolat-cover .chocolat-content .chocolat-bottom{
+    bottom: 0;
+    left: 0;
+    position: fixed;
+    background: rgba(255,255,255,0.75);
+    z-index: 1;
+}
+.chocolat-cover .chocolat-content .chocolat-pagination,
+.chocolat-cover .chocolat-content .chocolat-description{
+    padding: 0 10px;
+}
+
+
+/* no container mode*/
+body.chocolat-open>.chocolat-overlay{
+    z-index:15;
+}
+body.chocolat-open>.chocolat-loader{
+    z-index:15;
+}
+body.chocolat-open>.chocolat-content{
+    z-index:17;
+}
+
+/* container mode*/
+.chocolat-in-container .chocolat-wrapper,
+.chocolat-in-container .chocolat-content,
+.chocolat-in-container .chocolat-overlay{
+    position: absolute;
+}
+.chocolat-in-container{
+    position: relative;
+}
+
+/* uncomment to hide controls when zoomed-in*/
+/*
+.chocolat-zoomable .chocolat-top,
+.chocolat-zoomable .chocolat-bottom,
+.chocolat-zoomable .chocolat-right,
+.chocolat-zoomable .chocolat-left {
+    transition: opacity .3s ease, visibility 0s .3s;
+   opacity: 1;
+}
+
+.chocolat-zoomable.chocolat-zoomed .chocolat-top,
+.chocolat-zoomable.chocolat-zoomed .chocolat-bottom,
+.chocolat-zoomable.chocolat-zoomed .chocolat-right,
+.chocolat-zoomable.chocolat-zoomed .chocolat-left {
+    visibility: hidden;
+    opacity: 0;
+}
+*/
\ No newline at end of file
diff --git a/src/images/close.png b/src/images/close.png
new file mode 100644
index 0000000..87631d1
Binary files /dev/null and b/src/images/close.png differ
diff --git a/src/images/fullscreen.png b/src/images/fullscreen.png
new file mode 100644
index 0000000..7be7be9
Binary files /dev/null and b/src/images/fullscreen.png differ
diff --git a/src/images/left.png b/src/images/left.png
new file mode 100644
index 0000000..185f77b
Binary files /dev/null and b/src/images/left.png differ
diff --git a/src/images/loader.gif b/src/images/loader.gif
new file mode 100644
index 0000000..3c2f7c0
Binary files /dev/null and b/src/images/loader.gif differ
diff --git a/src/images/right.png b/src/images/right.png
new file mode 100644
index 0000000..5d46f36
Binary files /dev/null and b/src/images/right.png differ
diff --git a/src/js/jquery.chocolat.js b/src/js/jquery.chocolat.js
new file mode 100644
index 0000000..02d4dcd
--- /dev/null
+++ b/src/js/jquery.chocolat.js
@@ -0,0 +1,682 @@
+﻿; (function($, window, document, undefined) {
+    var calls = 0;
+    var defaults = {
+        container         : window, // window or jquery object or jquery selector, or element
+        imageSelector     : '.chocolat-image',
+        className         : '',
+        fullWindow        : false, // false, 'contain', 'cover' or 'native'
+        initialZoomState  : null,
+        fullScreen        : false,
+        loop              : false,
+        linkImages        : true,
+        duration          : 300,
+        setTitle          : '',
+        separator2        : '/',
+        setIndex          : 0,
+        firstImage        : 0,
+        lastImage         : false,
+        currentImage      : false,
+        initialized       : false,
+        timer             : false,
+        timerDebounce     : false,
+        images            : []
+    };
+
+    function Chocolat(element, settings) {
+        var that = this;
+
+        this.settings  = settings;
+        this._defaults = defaults;
+        this.elems     = {};
+
+        if (!this.settings.setTitle && element.data('chocolat-title')) {
+            this.settings.setTitle = element.data('chocolat-title');
+        }
+
+        element.find(this.settings.imageSelector).each(function () {
+            that.settings.images.push({
+                title  : $(this).attr('title'),
+                src    : $(this).attr('href'),
+                height : false,
+                width  : false
+            });
+        });
+
+        element.find(this.settings.imageSelector).each(function (i) {
+            $(this).off('click').on('click', function(event){
+                that.init(i);
+                event.preventDefault();
+            });
+        });
+
+        return this
+    }
+    $.extend(Chocolat.prototype, {
+
+        init : function(i) {
+            if(!this.settings.initialized){
+                this.setDomContainer();
+                this.markup();
+                this.events();
+                this.settings.lastImage   = this.settings.images.length - 1;
+                this.settings.initialized = true;
+            }
+
+            return this.load(i);
+        },
+
+        preload : function(i) {
+            var def = $.Deferred()
+
+            if(typeof this.settings.images[i] === 'undefined'){
+                return;
+            }
+            var imgLoader    = new Image();
+            imgLoader.onload = function() { def.resolve(imgLoader) };
+            imgLoader.src    = this.settings.images[i].src;
+
+            return def
+        },
+
+        load : function(i) {
+            var that = this;
+            if(this.settings.fullScreen){
+                this.openFullScreen();
+            }
+
+            if(this.settings.currentImage === i){
+                return;
+            }
+
+            this.elems.overlay.fadeIn(800);
+            this.settings.timer = setTimeout(function(){
+                if(typeof that.elems != 'undefined'){
+                    $.proxy(that.elems.loader.fadeIn(), that);
+                }
+            }, 800);
+
+            var deferred = this.preload(i)
+                .then(function (imgLoader) {
+                    return that.place(i, imgLoader)
+                })
+                .then(function (imgLoader) {
+                    return that.appear(i)
+                })
+                .then(function (imgLoader) {
+                    that.zoomable()
+                })
+
+            var nextIndex = i + 1
+            if(typeof this.settings.images[nextIndex] != 'undefined'){
+                this.preload(nextIndex);
+            }
+
+            return deferred;
+
+        },
+
+        place : function(i, imgLoader) {
+            var that = this;
+
+            this.settings.currentImage = i;
+            this.description();
+            this.pagination();
+            this.arrows();
+
+            this.storeImgSize(imgLoader, i);
+            fitting = this.fit(i, that.settings.container)
+
+            return this.center(
+                fitting.width,
+                fitting.height,
+                fitting.left,
+                fitting.top,
+                0
+            )
+        },
+
+        center : function(width, height, left, top, duration) {
+
+            return this.elems.content
+                .css('overflow', 'visible')
+                .animate({
+                    'width'  :width,
+                    'height' :height,
+                    'left'   :left,
+                    'top'    :top
+                }, duration)
+                .promise()
+        },
+
+        appear : function(i) {
+            var that = this;
+            clearTimeout(this.settings.timer);
+
+            this.elems.loader.stop().fadeOut(300, function() {
+                that.elems.img
+                    .attr('src', that.settings.images[i].src)
+            });
+        },
+
+        fit : function(i, container) {
+            var imgHeight        = this.settings.images[i].height;
+            var imgWidth         = this.settings.images[i].width;
+            var holderHeight     = $(container).height();
+            var holderWidth      = $(container).width();
+            var holderOutMarginH = this.getOutMarginH();
+            var holderOutMarginW = this.getOutMarginW();
+
+            var holderGlobalWidth  = holderWidth-holderOutMarginW;
+            var holderGlobalHeight = holderHeight-holderOutMarginH;
+            var holderGlobalRatio  = (holderGlobalHeight / holderGlobalWidth);
+            var holderRatio        = (holderHeight / holderWidth);
+            var imgRatio           = (imgHeight / imgWidth);
+
+            if(this.settings.fullWindow == 'cover') {
+                if(imgRatio < holderRatio) {
+                    height = holderHeight;
+                    width = height / imgRatio;
+                }
+                else {
+                    width = holderWidth;
+                    height = width * imgRatio;
+                }
+            }
+            else if(this.settings.fullWindow == 'native') {
+                height = imgHeight;
+                width = imgWidth;
+            }
+            else {
+                if(imgRatio>holderGlobalRatio) {
+                    height = holderGlobalHeight;
+                    width = height / imgRatio;
+                }
+                else {
+                    width = holderGlobalWidth;
+                    height = width * imgRatio;
+                }
+                if(!this.settings.fullWindow && (width >= imgWidth || height >= imgHeight)) {
+                    width=imgWidth;
+                    height=imgHeight;
+                }
+            }
+
+            return {
+                'height' : height,
+                'width'  : width,
+                'top'    : (holderHeight - height)/2,
+                'left'   : (holderWidth - width)/2
+            }
+        },
+
+        change : function(signe) {
+            this.zoomOut(0)
+            this.zoomable()
+
+            var requestedImage = this.settings.currentImage + parseInt(signe);
+            if(requestedImage > this.settings.lastImage) {
+                if(this.settings.loop){
+                    return this.load(0);
+                }
+            }
+            else if(requestedImage < 0) {
+                if(this.settings.loop) {
+                    return this.load(this.settings.lastImage);
+                }
+            }
+            else {
+                return this.load(requestedImage);
+            }
+        },
+
+        arrows: function() {
+            if(this.settings.loop) {
+                $([this.elems.left[0],this.elems.right[0]])
+                    .addClass('active');
+            }
+            else if(this.settings.linkImages) {
+                // right
+                if(this.settings.currentImage == this.settings.lastImage) {
+                    this.elems.right.removeClass('active')
+                }
+                else {
+                    this.elems.right.addClass('active');
+                }
+                // left
+                if(this.settings.currentImage == 0) {
+                    this.elems.left.removeClass('active')
+                }
+                else {
+                    this.elems.left.addClass('active');
+                }
+            }
+            else {
+                $([this.elems.left[0],this.elems.right[0]])
+                    .removeClass('active')
+            }
+        },
+
+        description : function() {
+            var that = this;
+            this.elems.description
+                .html(that.settings.images[that.settings.currentImage].title)
+        },
+
+        pagination : function() {
+            var that      = this;
+            var last      = this.settings.lastImage + 1;
+            var position  = this.settings.currentImage + 1;
+
+            this.elems.pagination
+                .html(position + ' '
+                      + that.settings.separator2
+                      + last)
+        },
+
+        storeImgSize : function(img, i) {
+            if(typeof img === 'undefined') {
+                return;
+            }
+            if(!this.settings.images[i].height || !this.settings.images[i].width){
+                this.settings.images[i].height = img.height;
+                this.settings.images[i].width  = img.width;
+            }
+        },
+
+        close : function() {
+
+            if (this.settings.fullscreenOpen) {
+                this.exitFullScreen();
+                return
+            }
+
+            var els = [
+                this.elems.overlay[0],
+                this.elems.loader[0],
+                this.elems.wrapper[0]
+            ];
+            var that = this;
+            var def = $.when($(els).fadeOut(200)).done(function () {
+                that.elems.domContainer.removeClass('chocolat-open chocolat-mobile chocolat-in-container chocolat-cover');
+            });
+            this.settings.currentImage = false;
+            this.settings.initialized = false;
+
+            return def;
+        },
+
+        getOutMarginW : function() {
+            var left  = this.elems.left.outerWidth();
+            var right = this.elems.right.outerWidth();
+            return left + right;
+        },
+
+        getOutMarginH : function() {
+            return this.elems.top.outerHeight() + this.elems.bottom.outerHeight();
+        },
+
+        markup : function() {
+            this.elems.domContainer.addClass('chocolat-open ' + this.settings.className);
+            if(this.settings.fullWindow == 'cover') {
+                this.elems.domContainer.addClass('chocolat-cover');
+            }
+            if(this.settings.container !== window) {
+                this.elems.domContainer.addClass('chocolat-in-container');
+            }
+            var that = this;
+
+            this.elems.wrapper = $('<div/>', {
+                'class' : 'chocolat-wrapper'
+            }).appendTo(this.elems.domContainer);
+
+            this.elems.overlay = $('<div/>', {
+                'class' : 'chocolat-overlay'
+            }).appendTo(this.elems.wrapper);
+
+            this.elems.loader = $('<div/>', {
+                'class' : 'chocolat-loader'
+            }).appendTo(this.elems.wrapper);
+
+            this.elems.content = $('<div/>', {
+                'class' : 'chocolat-content',
+                'id' : 'chocolat-content-' + this.settings.setIndex
+            }).appendTo(this.elems.wrapper);
+
+            this.elems.img = $('<img/>', {
+                'class' : 'chocolat-img',
+                'src' : ''
+            }).appendTo(this.elems.content);
+
+            this.elems.top = $('<div/>', {
+                'class' : 'chocolat-top'
+            }).appendTo(this.elems.wrapper);
+
+            this.elems.left = $('<div/>', {
+                'class' : 'chocolat-left'
+            }).appendTo(this.elems.wrapper);
+
+            this.elems.right = $('<div/>', {
+                'class' : 'chocolat-right'
+            }).appendTo(this.elems.wrapper);
+
+            this.elems.bottom = $('<div/>', {
+                'class' : 'chocolat-bottom'
+            }).appendTo(this.elems.wrapper);
+
+            this.elems.fullscreen = $('<span/>', {
+                'class' : 'chocolat-fullscreen'
+            }).appendTo(this.elems.bottom);
+
+            this.elems.description = $('<span/>', {
+                'class' : 'chocolat-description'
+            }).appendTo(this.elems.bottom);
+
+            this.elems.pagination = $('<span/>', {
+                'class' : 'chocolat-pagination'
+            }).appendTo(this.elems.bottom);
+
+            this.elems.setTitle = $('<span/>', {
+                'class' : 'chocolat-set-title',
+                'html' : this.settings.setTitle
+            }).appendTo(this.elems.bottom);
+
+            this.elems.close = $('<span/>', {
+                'class' : 'chocolat-close'
+            }).appendTo(this.elems.top);
+        },
+
+        openFullScreen : function() {
+            var wrapper = this.elems.wrapper[0];
+
+            if (wrapper.requestFullscreen) {
+                this.settings.fullscreenOpen = true;
+                wrapper.requestFullscreen();
+            }
+            else if (wrapper.mozRequestFullScreen) {
+                this.settings.fullscreenOpen = true;
+                wrapper.mozRequestFullScreen();
+            }
+            else if (wrapper.webkitRequestFullscreen) {
+                this.settings.fullscreenOpen = true;
+                wrapper.webkitRequestFullscreen();
+            }
+            else if(wrapper.msRequestFullscreen) {
+                wrapper.msRequestFullscreen();
+                this.settings.fullscreenOpen = true;
+            }
+            else {
+                this.settings.fullscreenOpen = false;
+            }
+        },
+
+        exitFullScreen : function() {
+            if(document.exitFullscreen) {
+                document.exitFullscreen();
+                this.settings.fullscreenOpen = false;
+            }
+            else if(document.mozCancelFullScreen) {
+                document.mozCancelFullScreen();
+                this.settings.fullscreenOpen = false;
+            }
+            else if(document.webkitExitFullscreen) {
+                document.webkitExitFullscreen();
+                this.settings.fullscreenOpen = false;
+            }
+            else {
+                this.settings.fullscreenOpen = true;
+            }
+        },
+
+        events : function() {
+            var that = this;
+
+            $(document).off('keydown.chocolat').on('keydown.chocolat', function(e) {
+                if (that.settings.initialized) {
+                    if(e.keyCode == 37) {
+                        that.change(-1);
+                    }
+                    else if(e.keyCode == 39) {
+                        that.change(1);
+                    }
+                    else if(e.keyCode == 27) {
+                        that.close();
+                    }
+                }
+            });
+            // this.elems.wrapper.find('.chocolat-img')
+            //     .off('click.chocolat')
+            //     .on('click.chocolat', function(e) {
+            //         var currentImage = that.settings.images[that.settings.currentImage];
+            //         if(currentImage.width > $(that.elems.wrapper).width() || currentImage.height > $(that.elems.wrapper).height() ){
+            //             that.toggleZoom(e);
+            //         }
+            // });
+
+            this.elems.wrapper.find('.chocolat-right')
+                .off('click.chocolat')
+                .on('click.chocolat', function() {
+                    that.change(+1);
+            });
+
+            this.elems.wrapper.find('.chocolat-left')
+                .off('click.chocolat')
+                .on('click.chocolat', function() {
+                    return that.change(-1);
+            });
+
+            $([this.elems.overlay[0], this.elems.close[0]])
+                .off('click.chocolat')
+                .on('click.chocolat', function() {
+                    return that.close();
+            });
+
+            this.elems.fullscreen
+                .off('click.chocolat')
+                .on('click.chocolat', function() {
+                    if (that.settings.fullscreenOpen) {
+                        that.exitFullScreen();
+                        return;
+                    }
+
+                    that.openFullScreen();
+            });
+
+            if (that.settings.backgroundClose) {
+                this.elems.overlay
+                    .off('click.chocolat')
+                    .on('click.chocolat', function() {
+                        return that.close();
+                });
+            }
+            this.elems.wrapper.find('.chocolat-img')
+                .off('click.chocolat')
+                .on('click.chocolat', function(e) {
+                    if(that.settings.initialZoomState === null && that.elems.domContainer.hasClass('chocolat-zoomable')){
+                        return that.zoomIn(e)
+                    }
+                    else{
+                        return that.zoomOut(e)
+                    }
+
+            });
+
+            this.elems.wrapper.mousemove(function( e ) {
+                if(that.settings.initialZoomState === null) {
+                    return;
+                }
+                if(that.elems.img.is(':animated')) {
+                    return;
+                }
+
+                var pos = $(this).offset();
+                var height = $(this).height();
+                var width = $(this).width();
+
+                var currentImage = that.settings.images[that.settings.currentImage]
+                var imgWidth = currentImage.width;
+                var imgHeight = currentImage.height;
+
+                var coord = [e.pageX - width/2 - pos.left, e.pageY - height/2 - pos.top]
+
+                var mvtX = 0
+                if (imgWidth > width) {
+                    mvtX = coord[0] / (width / 2)
+                    mvtX = ((imgWidth - width + 0)/ 2) * mvtX
+                }
+
+                var mvtY = 0;
+                if (imgHeight > height) {
+                    mvtY = coord[1] / (height / 2)
+                    mvtY = ((imgHeight - height + 0) / 2) * mvtY
+                }
+
+                var animation = {
+                    'margin-left': - mvtX + 'px',
+                    'margin-top': - mvtY + 'px'
+                }
+                if(typeof e.duration !== 'undefined') {
+                    $(that.elems.img).stop(false, true).animate(animation, e.duration)
+                }
+                else {
+                    $(that.elems.img).stop(false, true).css(animation);
+                }
+
+            });
+            $(window).on('resize', function() {
+                if(!that.settings.initialized){
+                    return;
+                }
+                that.debounce(50, function() {
+                    fitting = that.fit(that.settings.currentImage, that.settings.container)
+                    that.center(fitting.width, fitting.height, fitting.left, fitting.top, 0)
+                    that.zoomable()
+                });
+            });
+        },
+
+        zoomable : function () {
+            var currentImage = this.settings.images[this.settings.currentImage];
+            var wrapperWidth = this.elems.wrapper.width();
+            var wrapperHeight = this.elems.wrapper.height();
+
+            var isImageZoomable = currentImage.width > wrapperWidth || currentImage.height > wrapperHeight
+            var isImageStretched = this.elems.img.width() > currentImage.width || this.elems.img.height() > currentImage.height
+
+
+            if(isImageZoomable && !isImageStretched){
+                this.elems.domContainer.addClass('chocolat-zoomable')
+            }
+            else {
+                this.elems.domContainer.removeClass('chocolat-zoomable')
+            }
+        },
+
+        zoomIn : function (e) {
+            this.settings.initialZoomState = this.settings.fullWindow
+            this.settings.fullWindow = 'native';
+
+            var event = $.Event('mousemove');
+            event.pageX = e.pageX;
+            event.pageY = e.pageY;
+            event.duration = this.settings.duration;
+            this.elems.wrapper.trigger(event);
+
+            this.elems.domContainer.addClass('chocolat-zoomed')
+            fitting = this.fit(this.settings.currentImage, this.settings.container)
+            return this.center(fitting.width, fitting.height, fitting.left, fitting.top, this.settings.duration);
+        },
+
+        zoomOut : function (e, duration) {
+            if(this.settings.initialZoomState === null){
+                return;
+            }
+            var duration = duration || this.settings.duration
+
+            this.settings.fullWindow = this.settings.initialZoomState
+            this.settings.initialZoomState = null
+            this.elems.img.animate({'margin': 0}, duration)
+
+            this.elems.domContainer.removeClass('chocolat-zoomed')
+            fitting = this.fit(this.settings.currentImage, this.settings.container)
+            return this.center(fitting.width, fitting.height, fitting.left, fitting.top, duration);
+        },
+
+        setDomContainer : function() {
+            // if container == window
+            // domContainer = body
+            if( this.settings.container === window) {
+                this.elems.domContainer = $('body');
+            }
+            else {
+                this.elems.domContainer = $(this.settings.container);
+            }
+        },
+
+        debounce: function(duration, callback) {
+            clearTimeout(this.settings.timerDebounce);
+            this.settings.timerDebounce = setTimeout(function() {
+                callback();
+            }, duration);
+        },
+
+        api: function() {
+            var that = this
+            return {
+                open : function(i){
+                    i = parseInt(i) || 0;
+                    return that.init(i);
+                },
+
+                close : function(){
+                    return that.close();
+                },
+
+                next : function(){
+                    return that.change(1);
+                },
+
+                prev : function(){
+                    return that.change(-1);
+                },
+
+                goto : function(i){ // open alias
+                    return that.open(i);
+                },
+                current : function(){
+                    return that.settings.currentImage;
+                },
+
+                place : function(){
+                    return that.place(that.settings.currentImage, that.settings.duration);
+                },
+
+                set : function(property, value){
+                    return that.settings[property] = value;
+                },
+
+                get : function(property){
+                    return that.settings[property];
+                },
+
+                getElem : function(name){
+                    return that.elems[name];
+                },
+            }
+        }
+    });
+
+    $.fn['Chocolat'] = function (options) {
+        return this.each(function() {
+
+            calls++;
+
+            var settings = $.extend(true, {}, defaults, options, {setIndex:calls} );
+
+            if (!$.data(this, 'chocolat')) {
+                $.data(this, 'chocolat',
+                    new Chocolat($(this), settings)
+                );
+            }
+        });
+    }
+})( jQuery, window, document );
diff --git a/test/index.html b/test/index.html
index bbb7a15..560c22a 100644
--- a/test/index.html
+++ b/test/index.html
@@ -4,19 +4,19 @@
     <meta charset="utf-8">
     <title>Chocolat tests</title>
     <link rel="stylesheet" media="all" href="lib/mocha.css">
-    <link rel="stylesheet" media="all" href="../css/chocolat.css">
+    <link rel="stylesheet" media="all" href="../dist/css/chocolat.css">
 </head>
 <body>
     <div style="width: 299px;height: 500px;background: silver;margin-left: 250px;margin-top: 250px;" id="container"></div>
 
     <div id="example0">
-        <a class="chocolat-image" href="../demo-images/1.jpg" title="foo">
+        <a class="chocolat-image" href="../dist/demo-images/1.jpg" title="foo">
             1
         </a>
-        <a class="chocolat-image" href="../demo-images/2.jpg" title="baz">
+        <a class="chocolat-image" href="../dist/demo-images/2.jpg" title="baz">
             2
         </a>
-        <a class="chocolat-image" href="../demo-images/3.jpg" title="bar">
+        <a class="chocolat-image" href="../dist/demo-images/3.jpg" title="bar">
             3
         </a>
     </div>
@@ -28,7 +28,7 @@
     <script src="lib/sinon.js"></script>
     <script src="lib/chai.js"></script>
     <script src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
-    <script src="../js/jquery.chocolat.js"></script>
+    <script src="../dist/js/jquery.chocolat.js"></script>
     <script>
       mocha.setup('bdd')
       mocha.reporter('html');
diff --git a/test/src/test.chocolat.coffee b/test/test.chocolat.coffee
similarity index 97%
rename from test/src/test.chocolat.coffee
rename to test/test.chocolat.coffee
index 66cb565..8f721a4 100644
--- a/test/src/test.chocolat.coffee
+++ b/test/test.chocolat.coffee
@@ -232,7 +232,6 @@ describe "Chocolat", ->
 
                 chocolat.api().next().done( ->
 
-
                     expect(spyLoad.calledWithExactly(1)).to.be.true
                     spyChange = sinon.spy(chocolat, 'change')
 
@@ -246,8 +245,6 @@ describe "Chocolat", ->
 
                         done()
                     )
-
-
                 )
 
             )
@@ -295,9 +292,9 @@ describe "Chocolat", ->
         chocolat = $('<div />').Chocolat({
             backgroundClose: false,
             images         : [
-                {src : '../images/chocolat-1.jpg', title : 'You can zoom in the image'},
-                {src : '../images/chocolat-2.jpg', title : 'You can zoom in the image'}, 
-                {src : '../images/chocolat-3.jpg', title : 'You can zoom in the image'},
+                {src : '../dist/demo-images/1.jpg', title : 'You can zoom in the image'},
+                {src : '../dist/demo-images/2.jpg', title : 'You can zoom in the image'}, 
+                {src : '../dist/demo-images/3.jpg', title : 'You can zoom in the image'},
             ],
         }).data('chocolat')
 
