Add main package
Change Validation namespace