Reorg on libraries and dll: 32bits and 64 bits