Split unrelated functions into own API