move validation to another folder