Final version 2

(includes *.project files)