Improved cuke features structure.
Still doing some heavy lifting infra work.