Refactor both binaries into one
Simplify API and improve graphs