Moved some files arround, working on gulpfile