Move links into Links namespace