Restructured and fixed linking