Move helper apps to separate file