Final version 3

(includes .project files)