diff --git a/INDEX.md b/INDEX.md
new file mode 100644
index 0000000..e69de29
diff --git a/README.md b/README.md
index e52e91b..d1da5ea 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,6 @@
 # sapui5-reference
-Code samples for SAPUI5 for quick reference
+SAPUI5 code samples for quick reference
+
+This repository includes working SAPUI5 apps and an [index](INDEX.md) of samples with links to corresponding code blocks.
+
+##### Core
diff --git a/sapui5-walkthrough/webapp/Component.js b/src/sapui5-walkthrough/webapp/Component.js
similarity index 100%
rename from sapui5-walkthrough/webapp/Component.js
rename to src/sapui5-walkthrough/webapp/Component.js
diff --git a/sapui5-walkthrough/webapp/Invoices.json b/src/sapui5-walkthrough/webapp/Invoices.json
similarity index 100%
rename from sapui5-walkthrough/webapp/Invoices.json
rename to src/sapui5-walkthrough/webapp/Invoices.json
diff --git a/sapui5-walkthrough/webapp/control/ProductRating.js b/src/sapui5-walkthrough/webapp/control/ProductRating.js
similarity index 100%
rename from sapui5-walkthrough/webapp/control/ProductRating.js
rename to src/sapui5-walkthrough/webapp/control/ProductRating.js
diff --git a/sapui5-walkthrough/webapp/controller/App.controller.js b/src/sapui5-walkthrough/webapp/controller/App.controller.js
similarity index 100%
rename from sapui5-walkthrough/webapp/controller/App.controller.js
rename to src/sapui5-walkthrough/webapp/controller/App.controller.js
diff --git a/sapui5-walkthrough/webapp/controller/Detail.controller.js b/src/sapui5-walkthrough/webapp/controller/Detail.controller.js
similarity index 100%
rename from sapui5-walkthrough/webapp/controller/Detail.controller.js
rename to src/sapui5-walkthrough/webapp/controller/Detail.controller.js
diff --git a/sapui5-walkthrough/webapp/controller/HelloDialog.js b/src/sapui5-walkthrough/webapp/controller/HelloDialog.js
similarity index 100%
rename from sapui5-walkthrough/webapp/controller/HelloDialog.js
rename to src/sapui5-walkthrough/webapp/controller/HelloDialog.js
diff --git a/sapui5-walkthrough/webapp/controller/HelloPanel.controller.js b/src/sapui5-walkthrough/webapp/controller/HelloPanel.controller.js
similarity index 100%
rename from sapui5-walkthrough/webapp/controller/HelloPanel.controller.js
rename to src/sapui5-walkthrough/webapp/controller/HelloPanel.controller.js
diff --git a/sapui5-walkthrough/webapp/controller/InvoiceList.controller.js b/src/sapui5-walkthrough/webapp/controller/InvoiceList.controller.js
similarity index 100%
rename from sapui5-walkthrough/webapp/controller/InvoiceList.controller.js
rename to src/sapui5-walkthrough/webapp/controller/InvoiceList.controller.js
diff --git a/sapui5-walkthrough/webapp/css/style.css b/src/sapui5-walkthrough/webapp/css/style.css
similarity index 100%
rename from sapui5-walkthrough/webapp/css/style.css
rename to src/sapui5-walkthrough/webapp/css/style.css
diff --git a/sapui5-walkthrough/webapp/i18n/i18n.properties b/src/sapui5-walkthrough/webapp/i18n/i18n.properties
similarity index 100%
rename from sapui5-walkthrough/webapp/i18n/i18n.properties
rename to src/sapui5-walkthrough/webapp/i18n/i18n.properties
diff --git a/sapui5-walkthrough/webapp/index.html b/src/sapui5-walkthrough/webapp/index.html
similarity index 100%
rename from sapui5-walkthrough/webapp/index.html
rename to src/sapui5-walkthrough/webapp/index.html
diff --git a/sapui5-walkthrough/webapp/manifest.json b/src/sapui5-walkthrough/webapp/manifest.json
similarity index 100%
rename from sapui5-walkthrough/webapp/manifest.json
rename to src/sapui5-walkthrough/webapp/manifest.json
diff --git a/sapui5-walkthrough/webapp/model/formatter.js b/src/sapui5-walkthrough/webapp/model/formatter.js
similarity index 100%
rename from sapui5-walkthrough/webapp/model/formatter.js
rename to src/sapui5-walkthrough/webapp/model/formatter.js
diff --git a/sapui5-walkthrough/webapp/view/App.view.xml b/src/sapui5-walkthrough/webapp/view/App.view.xml
similarity index 100%
rename from sapui5-walkthrough/webapp/view/App.view.xml
rename to src/sapui5-walkthrough/webapp/view/App.view.xml
diff --git a/sapui5-walkthrough/webapp/view/Detail.view.xml b/src/sapui5-walkthrough/webapp/view/Detail.view.xml
similarity index 100%
rename from sapui5-walkthrough/webapp/view/Detail.view.xml
rename to src/sapui5-walkthrough/webapp/view/Detail.view.xml
diff --git a/sapui5-walkthrough/webapp/view/HelloDialog.fragment.xml b/src/sapui5-walkthrough/webapp/view/HelloDialog.fragment.xml
similarity index 100%
rename from sapui5-walkthrough/webapp/view/HelloDialog.fragment.xml
rename to src/sapui5-walkthrough/webapp/view/HelloDialog.fragment.xml
diff --git a/sapui5-walkthrough/webapp/view/HelloPanel.view.xml b/src/sapui5-walkthrough/webapp/view/HelloPanel.view.xml
similarity index 100%
rename from sapui5-walkthrough/webapp/view/HelloPanel.view.xml
rename to src/sapui5-walkthrough/webapp/view/HelloPanel.view.xml
diff --git a/sapui5-walkthrough/webapp/view/InvoiceList.view.xml b/src/sapui5-walkthrough/webapp/view/InvoiceList.view.xml
similarity index 100%
rename from sapui5-walkthrough/webapp/view/InvoiceList.view.xml
rename to src/sapui5-walkthrough/webapp/view/InvoiceList.view.xml
diff --git a/sapui5-walkthrough/webapp/view/Overview.view.xml b/src/sapui5-walkthrough/webapp/view/Overview.view.xml
similarity index 100%
rename from sapui5-walkthrough/webapp/view/Overview.view.xml
rename to src/sapui5-walkthrough/webapp/view/Overview.view.xml