use grunt
reorder structure