More directory and file changes
Added new files and updated validator