fix grunt compile issue and reorder folder structure