Initial decoupling of Weblinks

July made me do it!
Merge pull request #7 from eddieajau/master

Initial decoupling of Weblinks