Structure update for Kirby 2

Slight change to structure, working in Kirby 2 beta.