Refactor of directory structure. Updated gulp to concat js files and watch.