Reorganizing scripts and improving code style
Reorganizing spec runner templates
Reorganizing shims