Moving custom changes into v2.1 base files

moving current customizations into new v2.1 base directory.