Organizing and adding validation class

Organizing up and cleaning