Grunt min tasks added, reorganised files, bug fix