Fix a few compilation errors
Rename first version files