Simplify code and split up code into different cli applications.