Basic flock functional, untested
Separated services
Added Grunt