Re-structured based on Grunt Compiling order