Breaking out calculator versions

Separate html includes
Separate js files
New css and markup for calculator v2