refactoring structure
Merge pull request #5 from yaplas/refactor/validations

refactoring structure