[KFSQA-731] More preparations. Organizing stuff so it will separate nicely.