diff --git a/Readme.md b/Readme.md
index d91b12b4..9878816b 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,11 +1,13 @@
+<img alt="Websock Logo" align="left" src="websock.svg" width="15%"/>
+
 # Websocket for Nim
 
-![Github action](https://github.com/status-im/nim-ws/workflows/nim-ws%20CI/badge.svg)
+![Github action](https://github.com/status-im/nim-websock/workflows/CI/badge.svg)
 
 This is an implementation of [Websocket](https://tools.ietf.org/html/rfc6455) protocol for
-[Nim](https://nim-lang.org/). nim-ws have both client and server in regular ws and wss(secure) mode.
+[Nim](https://nim-lang.org/). nim-websock have both client and server in regular ws and wss(secure) mode.
 
-It also pass all autobahn tests [Autobahn summary report](https://status-im.github.io/nim-ws/).
+It also pass all autobahn tests [Autobahn summary report](https://status-im.github.io/nim-websock/).
 
  Building and testing
 --------------------
@@ -19,7 +21,7 @@ nimble install -d
 Starting HTTP server:
 
 ```bash
-nim c -r test/server.nim
+nim c -r examples/server.nim
 ```
 
 Testing Server Response:
diff --git a/websock.svg b/websock.svg
new file mode 100644
index 00000000..f1fd9200
--- /dev/null
+++ b/websock.svg
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 119.30209 131.93264"
+   xml:space="preserve"
+   sodipodi:docname="websock.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   width="119.30209"
+   height="131.93263"><metadata
+     id="metadata866"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs864" /><sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2714"
+     inkscape:window-height="1457"
+     id="namedview862"
+     showgrid="false"
+     inkscape:zoom="3.8047958"
+     inkscape:cx="152.2761"
+     inkscape:cy="135.57148"
+     inkscape:window-x="831"
+     inkscape:window-y="875"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><g
+     id="g1499"
+     transform="matrix(0.17615742,0.03287573,-0.04342164,0.196901,14.747491,-9.1860006)"
+     style="fill:#2b2200;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none"><g
+       id="g1442"
+       style="fill:#2b2200;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none">
+	<g
+   id="g1440"
+   style="fill:#2b2200;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none">
+		<path
+   id="path1438"
+   d="m 506.835,350.846 -41.2,-17.066 c -17.983,-50.302 -17.983,-105.253 0,-155.555 l 36.738,-15.218 c 4.269,-1.768 6.297,-6.663 4.528,-10.93 -1.768,-4.268 -6.661,-6.297 -10.93,-4.528 l -36.739,15.218 C 410.948,139.914 372.091,101.058 349.238,52.773 l 6.52,-15.74 c 1.769,-4.269 -0.258,-9.162 -4.528,-10.93 -4.264,-1.766 -9.161,0.259 -10.93,4.528 l -6.52,15.74 C 283.477,64.353 228.527,64.353 178.224,46.37 l -8.872,-21.42 c -1.768,-4.268 -6.661,-6.297 -10.93,-4.528 -4.269,1.769 -6.297,6.663 -4.528,10.93 l 8.872,21.42 c -22.853,48.284 -61.71,87.141 -109.994,109.994 L 11.57,145.699 c -4.269,-1.768 -9.162,0.26 -10.93,4.528 -1.769,4.269 0.258,9.162 4.528,10.93 l 41.2,17.066 c 17.983,50.302 17.983,105.253 0,155.555 L 9.63,348.999 c -4.269,1.768 -6.297,6.663 -4.528,10.93 1.334,3.221 4.448,5.167 7.732,5.167 1.066,0 2.152,-0.205 3.198,-0.639 l 36.739,-15.218 c 48.284,22.854 87.141,61.71 109.994,109.994 l -6.52,15.74 c -1.769,4.269 0.258,9.162 4.528,10.93 1.046,0.434 2.13,0.639 3.198,0.639 3.282,0 6.397,-1.945 7.732,-5.167 l 6.52,-15.74 c 50.304,-17.984 105.252,-17.984 155.556,0 l 8.872,21.419 c 1.334,3.221 4.448,5.167 7.732,5.167 1.066,0 2.152,-0.205 3.198,-0.639 4.269,-1.768 6.297,-6.663 4.528,-10.93 l -8.872,-21.42 c 22.853,-48.284 61.71,-87.14 109.994,-109.994 l 41.201,17.066 c 1.046,0.434 2.132,0.639 3.198,0.639 3.283,0 6.397,-1.945 7.732,-5.167 1.77,-4.268 -0.258,-9.162 -4.527,-10.93 z M 340.822,73.091 c 22.688,41.373 56.717,75.402 98.091,98.092 l -38.212,15.828 c -30.019,-20.252 -55.455,-45.689 -75.707,-75.707 z m 47.961,228.856 -35.563,-14.731 c -1.979,-20.739 -1.979,-41.689 0,-62.428 l 35.563,-14.731 c -4.795,30.552 -4.795,61.339 0,91.89 z M 123.22,210.059 158.783,224.79 c 1.979,20.74 1.979,41.69 0,62.428 l -35.563,14.731 c 4.796,-30.552 4.796,-61.339 0,-91.89 z m 212.599,69.949 -57.956,-24.005 57.956,-24.007 c -1.112,15.976 -1.112,32.037 0,48.012 z m -6.403,-63.468 -57.956,24.007 24.007,-57.957 c 10.509,12.08 21.867,23.439 33.949,33.95 z m -26.742,-51.353 14.731,-35.563 c 18.212,24.994 39.982,46.764 64.976,64.976 l -35.563,14.731 C 330.753,196.064 315.939,181.25 302.674,165.187 Z m -70.695,10.962 c 8.006,0.551 16.042,0.84 24.022,0.84 7.98,0 16.017,-0.289 24.022,-0.84 l -24.022,57.994 z m 48.045,159.709 c -8.007,-0.551 -16.043,-0.84 -24.022,-0.84 -7.979,0 -16.016,0.289 -24.022,0.84 l 24.022,-57.994 z m 7.203,-177.102 c -10.369,0.976 -20.846,1.5 -31.227,1.5 -10.38,0 -20.857,-0.524 -31.226,-1.5 L 210.055,123.22 c 30.318,4.707 61.574,4.707 91.891,0 z m -70.689,23.832 24.005,57.957 -57.956,-24.007 c 12.083,-10.509 23.442,-21.868 33.951,-33.95 z m -40.354,49.409 57.956,24.006 -57.956,24.007 c 1.112,-15.976 1.112,-32.037 0,-48.013 z M 165.186,209.33 129.623,194.6 c 24.994,-18.213 46.764,-39.982 64.976,-64.976 l 14.731,35.563 c -13.266,16.063 -28.08,30.877 -44.144,44.143 z m 0,93.345 c 16.067,13.268 30.881,28.082 44.144,44.144 l -14.731,35.564 c -18.212,-24.994 -39.982,-46.764 -64.976,-64.977 z m 17.4,-7.209 57.957,-24.005 -24.007,57.956 c -10.507,-12.08 -21.866,-23.439 -33.95,-33.951 z m 42.189,57.784 c 10.37,-0.976 20.848,-1.5 31.227,-1.5 10.379,0 20.857,0.524 31.227,1.5 l 14.718,35.532 c -15.158,-2.359 -30.548,-3.57 -45.945,-3.57 -15.397,0 -30.787,1.211 -45.944,3.57 z m 70.69,-23.832 -24.005,-57.957 57.956,24.007 c -12.084,10.511 -23.442,21.869 -33.951,33.95 z m 51.353,-26.743 35.563,14.731 c -24.994,18.213 -46.764,39.982 -64.976,64.976 l -14.731,-35.563 c 13.263,-16.061 28.077,-30.875 44.144,-44.144 z M 325.364,66.689 309.53,104.914 c -35.117,6.797 -71.941,6.797 -107.058,0 L 186.638,66.688 c 45.3,13.212 93.426,13.212 138.726,10e-4 z m -154.182,6.402 15.828,38.213 c -20.252,30.019 -45.689,55.455 -75.709,75.707 L 73.088,171.183 c 41.375,-22.69 75.404,-56.718 98.094,-98.092 z m -104.495,113.55 38.212,15.828 c 6.907,35.547 6.907,71.52 0,107.067 l -38.212,15.828 c 13.212,-45.299 13.212,-93.423 0,-138.723 z M 171.183,438.916 C 148.493,397.542 114.464,363.513 73.09,340.823 l 38.213,-15.828 c 30.019,20.252 55.455,45.689 75.709,75.709 z m 84.819,-3.512 c -23.357,0 -46.713,3.308 -69.363,9.914 l 15.834,-38.226 c 35.113,-6.796 71.944,-6.796 107.057,0 l 15.834,38.226 c -22.65,-6.605 -46.005,-9.914 -69.362,-9.914 z m 84.819,3.512 -15.828,-38.213 c 20.252,-30.019 45.689,-55.455 75.709,-75.707 l 38.213,15.828 c -41.375,22.689 -75.404,56.718 -98.094,98.092 z M 445.316,325.365 407.104,309.537 c -6.907,-35.547 -6.907,-71.52 0,-107.067 l 38.212,-15.828 c -13.21,45.299 -13.21,93.423 0,138.723 z"
+   style="fill:#2b2200;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none" />
+	</g>
+</g><g
+       id="g1444"
+       style="fill:#2b2200;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none">
+</g><g
+       id="g1446"
+       style="fill:#2b2200;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none">
+</g><g
+       id="g1448"
+       style="fill:#2b2200;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none">
+</g><g
+       id="g1450"
+       style="fill:#2b2200;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none">
+</g><g
+       id="g1452"
+       style="fill:#2b2200;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none">
+</g><g
+       id="g1454"
+       style="fill:#2b2200;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none">
+</g><g
+       id="g1456"
+       style="fill:#2b2200;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none">
+</g><g
+       id="g1458"
+       style="fill:#2b2200;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none">
+</g><g
+       id="g1460"
+       style="fill:#2b2200;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none">
+</g><g
+       id="g1462"
+       style="fill:#2b2200;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none">
+</g><g
+       id="g1464"
+       style="fill:#2b2200;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none">
+</g><g
+       id="g1466"
+       style="fill:#2b2200;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none">
+</g><g
+       id="g1468"
+       style="fill:#2b2200;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none">
+</g><g
+       id="g1470"
+       style="fill:#2b2200;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none">
+</g><g
+       id="g1472"
+       style="fill:#2b2200;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none">
+</g></g><path
+     id="path857"
+     d="M 76.060363,7.6259203 C 75.381073,7.4084827 74.655263,7.78231 74.437825,8.4616019 L 53.432055,74.08514 24.755877,89.067826 l -0.04957,0.02553 c -9.031906,4.908705 -12.722622,13.349764 -12.170642,21.425134 0.222223,3.27865 1.144397,6.48638 2.689897,9.38319 1.558317,2.90092 3.725195,5.48772 6.460204,7.49358 6.835724,5.04235 17.111077,6.45127 29.577081,0.0843 l 22.533351,-11.50947 c 0.234296,0.0185 0.474588,-0.0314 0.707357,-0.14062 l 17.059101,-8.71089 c 0.330182,-0.14865 0.60376,-0.42911 0.722739,-0.80081 l 0.08254,-0.25785 0.0041,-0.0128 5.854209,-18.288972 20.804646,-64.995215 0.008,-0.02503 c 0.21744,-0.67929 -0.1564,-1.405109 -0.83569,-1.622547 L 76.088002,7.6344369 Z"
+     style="fill:#ffff00;fill-opacity:1;stroke-width:1.34574"
+     sodipodi:nodetypes="csccccccccccsccccsscc" /><path
+     id="rect1522"
+     style="fill:#ffcc00;fill-opacity:1;stroke:#d4aa00;stroke-width:0.403722;stroke-miterlimit:4;stroke-dasharray:none"
+     d="m 76.060363,7.6259203 c -0.67929,-0.217438 -1.4051,0.156389 -1.62254,0.83568 l -21.00577,65.6235387 -28.67617,14.98269 -0.0496,0.0255 c -9.03191,4.90871 -12.72262,13.349761 -12.17065,21.425131 0.22223,3.27865 1.1444,6.48638 2.6899,9.38319 1.55832,2.90092 3.72519,5.48773 6.4602,7.49359 6.83572,5.04235 17.11108,6.45124 29.57708,0.0843 l 22.53337,-11.50946 c 0.23429,0.0185 0.47459,-0.0315 0.70735,-0.14063 l 17.05908,-8.7109 c 0.33018,-0.14865 0.60376,-0.42911 0.72274,-0.80081 l 0.0825,-0.25784 0.004,-0.0126 5.85421,-18.288981 20.804647,-64.995212 0.008,-0.02503 c 0.21744,-0.679291 -0.15638,-1.405105 -0.83567,-1.622542 L 76.087913,7.6346903 Z m -3.92948,16.5178717 39.667007,12.697213 -15.638737,48.856554 -0.33294,-0.10657 c -5.25489,-1.68206 -10.70701,-1.06844 -15.27115,1.27159 -4.55132,2.34412 -8.21771,6.42901 -9.90387,11.6967 -0.91899,2.870961 -1.15361,5.804231 -0.7878,8.634291 0.30946,2.38812 1.044,4.68667 2.1502,6.79288 l -21.93333,11.22133 c -11.45084,5.84415 -20.75987,4.64399 -26.89121,0.13797 -2.40023,-1.77153 -4.33713,-4.05943 -5.70426,-6.63066 -1.37583,-2.58814 -2.19756,-5.44991 -2.39828,-8.35429 -0.49413,-7.15253 2.79026,-14.635971 10.84545,-19.009511 l 29.18107,-15.23228 c 0.30865,-0.16968 0.52183,-0.44045 0.62029,-0.74805 z m 22.9282,63.886897 0.33293,0.10657 -5.32136,16.624301 -15.76109,8.05282 c -0.97959,-1.8396 -1.63238,-3.85897 -1.89572,-5.94973 -0.31869,-2.44759 -0.10612,-5.00531 0.70209,-7.530221 1.46873,-4.58841 4.65896,-8.15938 8.63092,-10.1944 3.96323,-2.05195 8.72381,-2.57807 13.31223,-1.10934 z" /><path
+     id="path1533"
+     fill="#231f20"
+     d="m 90.186957,63.755212 3.83494,-0.0126 -0.0302,-9.20794 -4.3348,-4.30636 -2.70284,2.72062 3.20791,3.18695 0.025,7.61917 z m 3.85138,1.90979 -13.37667,0.0439 -3.20802,-3.18681 1.35154,-1.36031 2.64955,2.63222 5.43359,-0.0178 -5.37021,-5.3452 1.36153,-1.37048 5.37015,5.33519 -0.0178,-5.43383 -2.63936,-2.62212 1.3413,-1.35027 -6.66967,-6.65639 -13.3565,0.0438 3.83734,3.81225 v 0.01 l 7.93293,-0.026 2.81202,2.79365 -4.08457,4.11144 -2.81201,-2.79364 -0.007,-2.17543 -3.83492,0.0126 0.0123,3.7641 6.65951,6.61599 -2.69283,2.71045 4.33479,4.30647 18.81037,-0.0617 z"
+     style="fill:#ff6600;stroke-width:0.120671" /></svg>