Test Refactor
* Refactored folder for model validation