[is_valid / is_simple] move files one directory level up (ommit the ogc directory);
move code one namespace up (ommit the ogc namespace);