Clean up command definitions
Update handler classes to match plugin xml
Updated readme.