Fixed linking between files