Remove un-necessary folder, expand on command help, and make NewTextEventArgs handle-able again