Moving code to hypermarks organization

Previous code from jtremback and Jeffj