thinned out app layer and moved state charts to cocktails core