[CLEANUP] folder structure and grunt task