and there we got some specs and code rearrangement