Re-scafold and grunt build implemented