Improved link handling in JsonNet
Merging project layout changes