RE: Linker reorganization