rearranging app to use Grunt and preferred app layout