Complete reorganization of the Grunt BP
Additional tweaks