Yes, you are right. I'll implement such approach if we finally need separate jelly files