update folder structure and grunt task