Updated Grunt file with structure updates and removed circular reference