diff --git a/README.md b/README.md
index 96dab9dde..41f6c5896 100644
--- a/README.md
+++ b/README.md
@@ -2,16 +2,25 @@
 
 A cross platform library to build native desktop apps. Based on Qt5.
 
-Mac screenshots:
+<img alt="logo" src="https://github.com/master-atul/nodegui/raw/master/extras/logo/logo.png" height="400" />
 
-![mac](https://github.com/master-atul/node-native-ui/raw/master/screens/mac_dark_mode.png "Mac OS Dark screenshot")
-![mac](https://github.com/master-atul/node-native-ui/raw/master/screens/mac_light_mode.png "Mac OS Light screenshot")
+## How does it look?
 
-Linux and Windows screenshots to be added soon.
+**Linux**
+
+<img alt="demo_linux" src="https://github.com/master-atul/nodegui/raw/master/examples/calculator/calculator_linux.png" height="400" />
+
+**Windows**
+
+<img alt="demo_win" src="https://github.com/master-atul/nodegui/raw/master/examples/calculator/calculator_win.jpg" height="400" />
+
+**Mac:**
+
+<img alt="demo_mac" src="https://github.com/master-atul/nodegui/raw/master/examples/calculator/calculator_mac.png" height="400" />
 
 **More screenshots?**
 
-[See examples](https://github.com/master-atul/node-native-ui/tree/master/examples/)
+[See examples](https://github.com/master-atul/nodegui/tree/master/examples/)
 
 ## Features
 
@@ -38,7 +47,7 @@ Looking to contribute? If you wish to implement a new widget/add more features a
 
 Contributing developer docs link:
 
-https://github.com/master-atul/node-native-ui/tree/master/devdocs
+https://github.com/master-atul/nodegui/tree/master/extras/devdocs
 
 
 ## Building
diff --git a/examples/calculator/README.md b/examples/calculator/README.md
index 05e88c35f..3405d2263 100644
--- a/examples/calculator/README.md
+++ b/examples/calculator/README.md
@@ -6,15 +6,15 @@ This example showcases how to build a basic calculator clone.
 
 **Linux**
 
-<img alt="demo_linux" src="https://github.com/master-atul/node-native-ui/raw/master/examples/calculator/calculator_linux.png" height="400" />
+<img alt="demo_linux" src="https://github.com/master-atul/nodegui/raw/master/examples/calculator/calculator_linux.png" height="400" />
 
 **Windows**
 
-<img alt="demo_win" src="https://github.com/master-atul/node-native-ui/raw/master/examples/calculator/calculator_win.jpg" height="400" />
+<img alt="demo_win" src="https://github.com/master-atul/nodegui/raw/master/examples/calculator/calculator_win.jpg" height="400" />
 
 **Mac:**
 
-<img alt="demo_mac" src="https://github.com/master-atul/node-native-ui/raw/master/examples/calculator/calculator_mac.png" height="400" />
+<img alt="demo_mac" src="https://github.com/master-atul/nodegui/raw/master/examples/calculator/calculator_mac.png" height="400" />
 
 
 To run the demo:
diff --git a/devdocs/common_errors.md b/extras/devdocs/common_errors.md
similarity index 100%
rename from devdocs/common_errors.md
rename to extras/devdocs/common_errors.md
diff --git a/devdocs/debugging.md b/extras/devdocs/debugging.md
similarity index 100%
rename from devdocs/debugging.md
rename to extras/devdocs/debugging.md
diff --git a/devdocs/setting_up.md b/extras/devdocs/setting_up.md
similarity index 100%
rename from devdocs/setting_up.md
rename to extras/devdocs/setting_up.md
diff --git a/devdocs/signal_and_event_handling.md b/extras/devdocs/signal_and_event_handling.md
similarity index 100%
rename from devdocs/signal_and_event_handling.md
rename to extras/devdocs/signal_and_event_handling.md
diff --git a/devdocs/styling.md b/extras/devdocs/styling.md
similarity index 100%
rename from devdocs/styling.md
rename to extras/devdocs/styling.md
diff --git a/devdocs/wrapping_widgets.md b/extras/devdocs/wrapping_widgets.md
similarity index 100%
rename from devdocs/wrapping_widgets.md
rename to extras/devdocs/wrapping_widgets.md
diff --git a/legal/yode/LICENSE b/extras/legal/yode/LICENSE
similarity index 100%
rename from legal/yode/LICENSE
rename to extras/legal/yode/LICENSE
diff --git a/legal/yoga/LICENSE b/extras/legal/yoga/LICENSE
similarity index 100%
rename from legal/yoga/LICENSE
rename to extras/legal/yoga/LICENSE
diff --git a/extras/logo/nodegui.png b/extras/logo/nodegui.png
new file mode 100644
index 000000000..16c3c0282
Binary files /dev/null and b/extras/logo/nodegui.png differ
diff --git a/extras/logo/nodegui.svg b/extras/logo/nodegui.svg
new file mode 100644
index 000000000..5389200c5
--- /dev/null
+++ b/extras/logo/nodegui.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 100 125"
+   xml:space="preserve"
+  >
+  <path d="m 59.284626,14.263209 c -0.687,0.229 -1.356531,0.439781 -2.019531,0.675781 -3.973,1.415 -7.755281,3.216328 -11.238281,5.611328 -2.41,1.657 -4.585985,3.567594 -6.333985,5.933594 -0.801,1.084 -1.470953,2.242422 -2.001953,3.482422 -0.041,0.096 -0.128703,0.205281 -0.220703,0.238281 -20.597575,15.458927 2.267881,0.111627 -9.351564,9.652345 -2.258,1.91 -4.263391,4.041562 -5.775391,6.601562 -1.007,1.705 -1.750375,3.507188 -1.984375,5.492188 -0.033,0.275 -0.03383,0.555031 -0.04883,0.832031 1.640871,-1.544702 3.536558,-3.011455 5.337894,-3.691403 -0.047,0.105 -0.07256,0.165562 -0.101563,0.226562 -0.223,0.467 -0.466016,0.927297 -0.666016,1.404297 -0.884,2.102 -1.276031,4.280641 -0.957031,6.556641 2.649665,9.258054 10.961484,16.080739 16.273435,22.951125 0.03,0.041 0.06762,0.0763 0.140625,0.154296 0.253,-2.415 -0.282688,-4.636781 -1.179688,-6.800781 4.602,3.96 6.954438,8.990313 7.148438,15.070313 0.053,-0.03 0.09695,-0.04522 0.126953,-0.07422 1.795,-1.707 3.536468,-3.462281 4.980468,-5.488281 1.166,-1.635 2.126766,-3.371079 2.634766,-5.330078 0.248,-0.955001 0.363313,-1.927016 0.320313,-2.916016 -0.003,-0.075 0.02908,-0.173563 0.08008,-0.226563 1.738,-1.789 3.732594,-3.160109 6.183593,-3.787109 1.770001,-0.454 3.54236,-0.408436 5.31836,-0.02344 2.614,0.567 5.233844,1.104124 7.839844,1.703126 0.695,0.158998 1.305984,0.09347 1.958984,-0.144532 3.262,-1.188 6.281672,-2.792328 8.888672,-5.111328 1.926,-1.713 3.424172,-3.730016 4.326172,-6.166016 0.086,-0.232998 0.04275,-0.33189 -0.15625,-0.46289 -4.89,-3.227 -9.775016,-6.463453 -14.666016,-9.689453 -0.24,-0.158 -0.309969,-0.336516 -0.292969,-0.603516 0.05,-0.782 0.443797,-1.353187 1.091797,-1.742187 0.407,-0.243 0.853453,-0.41958 1.314453,-0.642578 -3.624,-4.147 -7.425203,-8.13975 -11.658203,-11.71875 0.286,-0.643001 0.57361,-1.277969 0.84961,-1.917969 1.233,-2.865 2.31239,-5.782219 3.02539,-8.824219 0.305,-1.301 0.522938,-2.616125 0.585938,-3.953125 0.004,-0.083 0,-0.165969 0,-0.292969 -3.123,0.87 -6.123156,1.925485 -8.910156,3.646485 0.021,-0.373 0.03655,-0.711828 0.06055,-1.048829 0.123,-1.751 0.11812,-3.499046 -0.04687,-5.248046 -0.129,-1.363 -0.359718,-2.703672 -0.761718,-4.013672 -0.029,-0.095 -0.06924,-0.188453 -0.115235,-0.314453 z m -1.822265,3.478515 c 0.013,0.07 0.02244,0.09795 0.02344,0.126953 0.026,1.207 0.09136,2.416047 0.06836,3.623047 -0.049,2.578 -0.427579,5.11275 -1.142579,7.59375 -0.449,1.558 -1.022078,3.065516 -1.830078,4.478516 -0.091,0.16 -0.194859,0.2665 -0.380859,0.3125 -0.609,0.151 -1.211266,0.333562 -1.822266,0.476562 -0.478,0.111 -0.964625,0.18125 -1.515625,0.28125 -0.107,-0.645 -0.223781,-1.245609 -0.300781,-1.849609 -0.077,-0.608 0.04775,-1.200109 0.21875,-1.787109 -1.061,0.927 -2.003781,1.920156 -2.175781,3.410156 -0.536,-3.312 0.119812,-6.37275 1.882812,-9.21875 -2.778,2.307 -4.970203,5.014609 -5.908203,8.599609 -0.068,-0.336 -0.134969,-0.670765 -0.167969,-1.009765 -0.171,-1.737 0.14,-3.392704 0.875,-4.970704 0.895,-1.922999 2.2445,-3.493671 3.8125,-4.888671 2.141,-1.905 4.556766,-3.390094 7.134766,-4.621094 0.4,-0.191 0.806516,-0.366641 1.228516,-0.556641 z m -0.08984,25.408203 c 0.293352,-0.006 0.586859,-0.0029 0.880859,0.0078 0.392,0.01422 0.784485,0.04344 1.177735,0.08594 2.486,0.27 4.759734,1.110688 6.802734,2.554688 2.051,1.45 3.615047,3.333234 4.873047,5.490234 0.06,0.103 0.149,0.204625 0.25,0.265625 2.329,1.413 4.66214,2.820516 6.99414,4.228516 1.384001,0.836 2.767297,1.672906 4.154297,2.503906 0.133,0.08 0.177578,0.153406 0.142579,0.316406 -0.065,0.299 -0.10086,0.604202 -0.13086,0.908204 -0.131,1.341999 -0.06258,2.665984 0.357422,3.958984 0.265,0.817 0.702141,1.538125 1.244141,2.203125 -0.024,0.033 -0.03755,0.06203 -0.06055,0.08203 -0.383,0.337 -0.756297,0.68786 -1.154297,1.00586 -2.386,1.906998 -5.062641,3.280781 -7.931641,4.300781 -0.264,0.094 -0.499953,0.08518 -0.751953,-0.0059 -1.877,-0.679 -3.795094,-1.209045 -5.746094,-1.623047 -2.934,-0.622998 -5.899437,-0.974328 -8.898437,-0.986328 -1.216,-0.005 -2.434391,0.06419 -3.650391,0.117188 -0.464,0.02 -0.925672,0.08876 -1.388672,0.134766 1.436,0.317999 2.886455,0.538046 4.314453,1.123046 -1.813999,0.706 -3.351999,1.732625 -4.75,3.015625 -0.03,-0.105 -0.05027,-0.178953 -0.07227,-0.251953 -0.218,-0.728 -0.402111,-1.46864 -0.662109,-2.18164 -0.941001,-2.578 -2.33325,-4.916391 -3.90625,-7.150391 -1.031,-1.464 -2.066813,-2.922438 -2.882813,-4.523437 -0.138,-0.270002 -0.273109,-0.542313 -0.412109,-0.820313 -0.344,0.375 -0.624375,1.444266 -0.734375,2.697266 -0.234,-0.569 -0.463063,-1.138703 -0.664063,-1.720703 -0.616,-1.784002 -1.0225,-3.606719 -0.9375,-5.511719 0.076,-1.704 0.581203,-3.251797 1.658203,-4.591797 0.889,-1.107 2.018969,-1.906 3.292969,-2.5 2.332,-1.087 4.814328,-1.546844 7.361328,-1.714844 0.461,-0.031 0.922766,-0.04345 1.384766,-0.06445 0.001,-0.011 9.06e-4,-0.0222 0.002,-0.0332 -1.029,-0.304 -2.056328,-0.608922 -3.111328,-0.919922 0.049,-0.037 0.05826,-0.05169 0.07227,-0.05469 0.084,-0.02 0.166953,-0.03964 0.251954,-0.05664 0.873561,-0.176625 1.750801,-0.271155 2.630859,-0.289063 z"/>
+</svg>
\ No newline at end of file
diff --git a/screens/mac_dark_mode.png b/screens/mac_dark_mode.png
deleted file mode 100644
index acdcf631c..000000000
Binary files a/screens/mac_dark_mode.png and /dev/null differ
diff --git a/screens/mac_light_mode.png b/screens/mac_light_mode.png
deleted file mode 100644
index 1f28878db..000000000
Binary files a/screens/mac_light_mode.png and /dev/null differ