Update of missing files and revision of "old" Cmake file

Wait for tests. However, testing on local machine on complex model runs correctly.