Move app specific header bits, defined consts and structs out of cli-sub.h