inital set up
Revert "inital set up"

This reverts commit a1c6b8af233373594aa9f21be36446a8092ec0db.
Merge branch 'master' into multiproject