Moved jwsur2 code to it's branch