diff --git a/common/src/main/java/com/codename1/demos/kitchen/AdvancedDemo.java b/common/src/main/java/com/codename1/demos/kitchen/AdvancedDemo.java
index cda1019..73604b2 100644
--- a/common/src/main/java/com/codename1/demos/kitchen/AdvancedDemo.java
+++ b/common/src/main/java/com/codename1/demos/kitchen/AdvancedDemo.java
@@ -46,8 +46,10 @@
 public class AdvancedDemo extends Demo{
     private final HashMap<String, List<String>> allNotes = new HashMap<>();
     
+    
+
     public AdvancedDemo(Form parentForm) {
-        init("Advanced", getGlobalResources().getImage("advanced-icon.png"), parentForm, "https://github.com/codenameone/KitchenSink/blob/master/src/com/codename1/demos/kitchen/AdvancedDemo.java");
+        init("Advanced", getGlobalResources().getImage("advanced-icon.png"), parentForm, "https://github.com/codenameone/KitchenSink/tree/master/common/src/main/java/com/codename1/demos/kitchen/AdvancedDemo.java");
     }
 
     @Override
diff --git a/common/src/main/java/com/codename1/demos/kitchen/ButtonsDemo.java b/common/src/main/java/com/codename1/demos/kitchen/ButtonsDemo.java
index cef7809..b050d66 100644
--- a/common/src/main/java/com/codename1/demos/kitchen/ButtonsDemo.java
+++ b/common/src/main/java/com/codename1/demos/kitchen/ButtonsDemo.java
@@ -49,7 +49,7 @@ public class ButtonsDemo extends Demo{
 
     public ButtonsDemo(Form parentForm) {
         init("Buttons", getGlobalResources().getImage("demo-buttons.png"), parentForm,
-                "https://github.com/codenameone/KitchenSink/blob/master/src/com/codename1/demos/kitchen/ButtonsDemo.java");
+                "https://github.com/codenameone/KitchenSink/tree/master/common/src/main/java/com/codename1/demos/kitchen/ButtonsDemo.java");
     }
      
     @Override
diff --git a/common/src/main/java/com/codename1/demos/kitchen/ChartsDemo.java b/common/src/main/java/com/codename1/demos/kitchen/ChartsDemo.java
index ed0de4d..65dbcc4 100644
--- a/common/src/main/java/com/codename1/demos/kitchen/ChartsDemo.java
+++ b/common/src/main/java/com/codename1/demos/kitchen/ChartsDemo.java
@@ -42,7 +42,7 @@ public class ChartsDemo extends Demo {
     
     public ChartsDemo(Form parentForm) {
         init("Charts", getGlobalResources().getImage("charts-demo-icon.png"), parentForm,
-                "https://github.com/codenameone/KitchenSink/blob/master/src/com/codename1/demos/kitchen/ChartsDemo.java");
+                "https://github.com/codenameone/KitchenSink/tree/master/common/src/main/java/com/codename1/demos/kitchen/ChartsDemo.java");
     }
 
     @Override
diff --git a/common/src/main/java/com/codename1/demos/kitchen/ClockDemo.java b/common/src/main/java/com/codename1/demos/kitchen/ClockDemo.java
index e58c334..b3041ae 100644
--- a/common/src/main/java/com/codename1/demos/kitchen/ClockDemo.java
+++ b/common/src/main/java/com/codename1/demos/kitchen/ClockDemo.java
@@ -53,7 +53,7 @@ public class ClockDemo extends Demo{
 
     public ClockDemo(Form parentForm) {
         init("Clock", new ClockImage(), parentForm,
-                "https://github.com/codenameone/KitchenSink/blob/master/src/com/codename1/demos/kitchen/ClockDemo.java");
+                "https://github.com/codenameone/KitchenSink/tree/master/common/src/main/java/com/codename1/demos/kitchen/ClockDemo.java");
     }
 
     @Override
diff --git a/common/src/main/java/com/codename1/demos/kitchen/ContainersDemo.java b/common/src/main/java/com/codename1/demos/kitchen/ContainersDemo.java
index 0681c2d..77f6489 100644
--- a/common/src/main/java/com/codename1/demos/kitchen/ContainersDemo.java
+++ b/common/src/main/java/com/codename1/demos/kitchen/ContainersDemo.java
@@ -54,7 +54,7 @@ public class ContainersDemo extends Demo{
     private Container colorsContainer;
 
     public ContainersDemo(Form parentForm) {
-        init("Containers", getGlobalResources().getImage("containers-demo.png"), parentForm, "https://github.com/codenameone/KitchenSink/blob/master/src/com/codename1/demos/kitchen/ContainersDemo.java");
+        init("Containers", getGlobalResources().getImage("containers-demo.png"), parentForm, "https://github.com/codenameone/KitchenSink/tree/master/common/src/main/java/com/codename1/demos/kitchen/ContainersDemo.java");
     }
 
     @Override
diff --git a/common/src/main/java/com/codename1/demos/kitchen/DialogDemo.java b/common/src/main/java/com/codename1/demos/kitchen/DialogDemo.java
index c135601..9aec08d 100644
--- a/common/src/main/java/com/codename1/demos/kitchen/DialogDemo.java
+++ b/common/src/main/java/com/codename1/demos/kitchen/DialogDemo.java
@@ -49,7 +49,7 @@ public class DialogDemo extends Demo {
     
     public DialogDemo(Form parentForm) {
         init("Dialog", getGlobalResources().getImage("dialog-demo.png"), parentForm,
-                "https://github.com/codenameone/KitchenSink/blob/master/src/com/codename1/demos/kitchen/DialogDemo.java");
+                "https://github.com/codenameone/KitchenSink/tree/master/common/src/main/java/com/codename1/demos/kitchen/DialogDemo.java");
     }
      
     @Override
diff --git a/common/src/main/java/com/codename1/demos/kitchen/LabelsDemo.java b/common/src/main/java/com/codename1/demos/kitchen/LabelsDemo.java
index 19e3662..df43b98 100644
--- a/common/src/main/java/com/codename1/demos/kitchen/LabelsDemo.java
+++ b/common/src/main/java/com/codename1/demos/kitchen/LabelsDemo.java
@@ -42,7 +42,7 @@ public class LabelsDemo extends Demo {
     
     public LabelsDemo(Form parentForm) {
         init("Labels", getGlobalResources().getImage("demo-labels.png"), parentForm,
-                "https://github.com/codenameone/KitchenSink/blob/master/src/com/codename1/demos/kitchen/LabelsDemo.java");
+                "https://github.com/codenameone/KitchenSink/tree/master/common/src/main/java/com/codename1/demos/kitchen/LabelsDemo.java");
     }
 
     @Override
diff --git a/common/src/main/java/com/codename1/demos/kitchen/MapsDemo.java b/common/src/main/java/com/codename1/demos/kitchen/MapsDemo.java
index 215bde0..c69b0d3 100644
--- a/common/src/main/java/com/codename1/demos/kitchen/MapsDemo.java
+++ b/common/src/main/java/com/codename1/demos/kitchen/MapsDemo.java
@@ -54,7 +54,7 @@ public class MapsDemo extends Demo {
 
     public MapsDemo(Form parentForm) {
         init("Maps", getGlobalResources().getImage("demo-maps.png"), parentForm,
-                "https://github.com/codenameone/KitchenSink/blob/master/src/com/codename1/demos/kitchen/MapsDemo.java");
+                "https://github.com/codenameone/KitchenSink/tree/master/common/src/main/java/com/codename1/demos/kitchen/MapsDemo.java");
     }
     
     @Override
diff --git a/common/src/main/java/com/codename1/demos/kitchen/MediaDemo.java b/common/src/main/java/com/codename1/demos/kitchen/MediaDemo.java
index 8330202..8775aa7 100644
--- a/common/src/main/java/com/codename1/demos/kitchen/MediaDemo.java
+++ b/common/src/main/java/com/codename1/demos/kitchen/MediaDemo.java
@@ -56,7 +56,7 @@ public class MediaDemo extends Demo {
     
     public MediaDemo(Form parentForm) {
         init("Media", getGlobalResources().getImage("media-demo-icon.png"), parentForm,
-                "https://github.com/codenameone/KitchenSink/blob/master/src/com/codename1/demos/kitchen/MediaDemo.java");
+                "https://github.com/codenameone/KitchenSink/tree/master/common/src/main/java/com/codename1/demos/kitchen/MediaDemo.java");
     }
 
     @Override
diff --git a/common/src/main/java/com/codename1/demos/kitchen/ProgressDemo.java b/common/src/main/java/com/codename1/demos/kitchen/ProgressDemo.java
index 0fd057f..cdabcd9 100644
--- a/common/src/main/java/com/codename1/demos/kitchen/ProgressDemo.java
+++ b/common/src/main/java/com/codename1/demos/kitchen/ProgressDemo.java
@@ -58,7 +58,7 @@ public class ProgressDemo extends Demo {
     
     public ProgressDemo(Form parentForm) {
         init("Progress", getGlobalResources().getImage("progress-demo.png"), parentForm,
-                "https://github.com/codenameone/KitchenSink/blob/master/src/com/codename1/demos/kitchen/ProgressDemo.java");
+                "https://github.com/codenameone/KitchenSink/tree/master/common/src/main/java/com/codename1/demos/kitchen/ProgressDemo.java");
     }
      
     @Override
diff --git a/common/src/main/java/com/codename1/demos/kitchen/SelectionDemo.java b/common/src/main/java/com/codename1/demos/kitchen/SelectionDemo.java
index 7926a10..a2c9e6b 100644
--- a/common/src/main/java/com/codename1/demos/kitchen/SelectionDemo.java
+++ b/common/src/main/java/com/codename1/demos/kitchen/SelectionDemo.java
@@ -45,7 +45,7 @@
 public class SelectionDemo extends Demo{
     
     public SelectionDemo(Form parentForm) {
-        init("Selection", getGlobalResources().getImage("selection-demo.png"), parentForm, "https://github.com/codenameone/KitchenSink/blob/master/src/com/codename1/demos/kitchen/SelectionDemo.java");
+        init("Selection", getGlobalResources().getImage("selection-demo.png"), parentForm, "https://github.com/codenameone/KitchenSink/tree/master/common/src/main/java/com/codename1/demos/kitchen/SelectionDemo.java");
     }
      
     @Override
diff --git a/common/src/main/java/com/codename1/demos/kitchen/TextInputDemo.java b/common/src/main/java/com/codename1/demos/kitchen/TextInputDemo.java
index 9b33f8c..2a83590 100644
--- a/common/src/main/java/com/codename1/demos/kitchen/TextInputDemo.java
+++ b/common/src/main/java/com/codename1/demos/kitchen/TextInputDemo.java
@@ -54,7 +54,7 @@
 public class TextInputDemo extends Demo{
     
     public TextInputDemo(Form parentForm) {
-        init("Text Input", getGlobalResources().getImage("text-field-demo.png"), parentForm, "https://github.com/codenameone/KitchenSink/blob/master/src/com/codename1/demos/kitchen/TextInputDemo.java");
+        init("Text Input", getGlobalResources().getImage("text-field-demo.png"), parentForm, "https://github.com/codenameone/KitchenSink/tree/master/common/src/main/java/com/codename1/demos/kitchen/TextInputDemo.java");
     }
      
     @Override
diff --git a/common/src/main/java/com/codename1/demos/kitchen/TogglesDemo.java b/common/src/main/java/com/codename1/demos/kitchen/TogglesDemo.java
index d00c54b..c7f0f08 100644
--- a/common/src/main/java/com/codename1/demos/kitchen/TogglesDemo.java
+++ b/common/src/main/java/com/codename1/demos/kitchen/TogglesDemo.java
@@ -45,7 +45,7 @@ public class TogglesDemo extends Demo {
     
     public TogglesDemo(Form parentForm) {
         init("Toggles", getGlobalResources().getImage("toggles-demo.png"), parentForm,
-                "https://github.com/codenameone/KitchenSink/blob/master/src/com/codename1/demos/kitchen/TogglesDemo.java");
+                "https://github.com/codenameone/KitchenSink/tree/master/common/src/main/java/com/codename1/demos/kitchen/TogglesDemo.java");
     }
      
     @Override
diff --git a/common/src/main/java/com/codename1/demos/kitchen/ToolbarDemo.java b/common/src/main/java/com/codename1/demos/kitchen/ToolbarDemo.java
index 4902b8a..2f0a7d2 100644
--- a/common/src/main/java/com/codename1/demos/kitchen/ToolbarDemo.java
+++ b/common/src/main/java/com/codename1/demos/kitchen/ToolbarDemo.java
@@ -44,7 +44,7 @@
 public class ToolbarDemo extends Demo{
     public ToolbarDemo(Form parentForm) {
         init("Toolbar", getGlobalResources().getImage("toolbar-demo.png"), parentForm,
-                "https://github.com/codenameone/KitchenSink/blob/master/src/com/codename1/demos/kitchen/ToolbarDemo.java");
+                "https://github.com/codenameone/KitchenSink/tree/master/common/src/main/java/com/codename1/demos/kitchen/ToolbarDemo.java");
     }
 
     @Override