Remane files and fix linking in between