Changed architecture diagram
fixed merge errors