Moved api validator package
Fixing more merge conflicts