Having the license file in the root dir should be sufficient for now. We will discuss the licensing of the error reporting server code on our team meeting in two weeks.

I was just thinking that because copyright holders are mixed, it might be convenient to indicate which files are created/modified and thus have different or another copyright holder.