Add working cli and new plugin structure