change file structure and add validators