more structure and files added, validator missing and testing is needed