back to initial commit

refactored code broke validation, starting from scratch
original files restored
Revert "deleted some files"

This reverts commit fc7b9c9df8d637ab97b24846e036d6c266853915.
original files restored