Modified validation files name.
Bug fix and reconstruct validation mechanism.
Bug fix and reconstruct some class