Cleanup project structure & rerun grunt task