Updated references and links to new location