CMake: Add modules files
Version: Fix compilation warning on return type