Redid directory structure to reflect R2 versions properly
Added new 2.1 schemas