Kirby2

Adjustments for kirby2.

* new folder structure