Fixing wget links and (re)structuring