Change effect
Restructure and Grunt