Organize code on zoo-dependencies