Added missing files and created correct linkage.