Directory structure changes

+ preparations for Gulp