Removed schema file to be replaced with more generic version
Added generic schema file with minor updates