KAZOO-584: futher tweaks to the structure