Update to 2.3.1  

 - Updated code with package from marketplace
 - dir cleanup
 - rename files
add new 'easy' fire package