Move collection definitions out of initial skeleton.