Update grape appname
Rearrange folder structure