Updates compositions to latest Flocking API and file layout.