add report template, move some files around
udpate TODO
Merge branch 'master' into sla-determination
cleanup