Merge site, test, rest into new site repo

This is the intial merge, scripts not yet updated for new directory
structure
add test directory