moved validator into subdirectory