Initial commit for conversion to linux x64