This version has some bug fixes

* Code 422 - Validation Failed
* Re-order file structure
* Enhance testing
