diff --git a/README.md b/README.md
index a08fc18..d1a14ea 100644
--- a/README.md
+++ b/README.md
@@ -4,16 +4,6 @@
 ## About
 This is a basic Hello Word Skill that takes an _Utterance_ from the user and provides a voice response - a _Dialog_. This Skill demonstrates the basic directory and file structure of a Mycroft Skill, and is a good first Skill to study if you are interested in developing Skills for the Mycroft ecosystem.
 
-If you want to write **Skills** for Mycroft, Documentation is available:
-
-* [Mycroft Skills Kit](https://mycroft.ai/documentation/skills/msk/)
-* [Developing a new Skill](https://mycroft.ai/documentation/skills/introduction-developing-skills/)
-* [Skill Settings](https://mycroft.ai/documentation/skills/skill-settings/)
-* [Automatic testing of your Mycroft Skill](https://mycroft.ai/documentation/skills/automatic-testing/)
-* [Skill Acceptance Process](https://mycroft.ai/documentation/skills/skills-acceptance-process/)
-* [Mycroft Skills Manager](https://mycroft.ai/documentation/msm/)
-* [Mycroft Message Bus](https://mycroft.ai/documentation/message-bus/)
-
 ## Examples
 * "Hello world"
 * "How are you?"
diff --git a/__init__.py b/__init__.py
index b6eca08..c561a2c 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,23 +1,7 @@
-# Copyright 2016 Mycroft AI, Inc.
-#
-# This file is part of Mycroft Core.
-#
-# Mycroft Core is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Mycroft Core is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Mycroft Core.  If not, see <http://www.gnu.org/licenses/>.
-
 from adapt.intent import IntentBuilder
 from mycroft import MycroftSkill, intent_handler
 
+
 class HelloWorldSkill(MycroftSkill):
     def __init__(self):
         """ The __init__ method is called when the Skill is first constructed.
diff --git a/dialog/ca-es/hello.world.dialog b/dialog/ca-es/hello.world.dialog
deleted file mode 100644
index e70f6a2..0000000
--- a/dialog/ca-es/hello.world.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Hola món
-Hola
-Hola a tu també
diff --git a/dialog/ca-es/how.are.you.dialog b/dialog/ca-es/how.are.you.dialog
deleted file mode 100644
index 3445b20..0000000
--- a/dialog/ca-es/how.are.you.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-Anem bé
-Força bé
-No pas malament
-Estic molt bé
-Podria ser millor
-Estic molt bé
diff --git a/dialog/ca-es/welcome.dialog b/dialog/ca-es/welcome.dialog
deleted file mode 100644
index 09da45c..0000000
--- a/dialog/ca-es/welcome.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-En qualsevol moment.
-M'alegra ser útil.
-M'alegra ajudar.
-El plaer és meu.
-Cap problema.
-De res.
diff --git a/dialog/cs-cz/hello.world.dialog b/dialog/cs-cz/hello.world.dialog
deleted file mode 100644
index a28e304..0000000
--- a/dialog/cs-cz/hello.world.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Ahoj světe
-Ahoj
-Ahoj i Vám
diff --git a/dialog/cs-cz/how.are.you.dialog b/dialog/cs-cz/how.are.you.dialog
deleted file mode 100644
index 68a2cb3..0000000
--- a/dialog/cs-cz/how.are.you.dialog
+++ /dev/null
@@ -1,4 +0,0 @@
-Mám se dobře
-Mám se výtečně
-Dost dobře
-Mám se velmi dobře
diff --git a/dialog/cs-cz/welcome.dialog b/dialog/cs-cz/welcome.dialog
deleted file mode 100644
index f71aa51..0000000
--- a/dialog/cs-cz/welcome.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-Kdykoliv.
-Rád jsem pomohl.
-Není problém.
-Nemáte zač.
-Rád jsem posloužil.
-Potěšení je na mé straně.
\ No newline at end of file
diff --git a/dialog/da-dk/hello.world.dialog b/dialog/da-dk/hello.world.dialog
deleted file mode 100644
index c352d0b..0000000
--- a/dialog/da-dk/hello.world.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Hej verden
-Hej
-Hej til dig også
diff --git a/dialog/da-dk/how.are.you.dialog b/dialog/da-dk/how.are.you.dialog
deleted file mode 100644
index 60eac09..0000000
--- a/dialog/da-dk/how.are.you.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-Jeg har det fint
-Rimeligt godt
-Ikke værst
-Jeg har det super
-Kunne ikek have det bedre
-Jeg har det fint
diff --git a/dialog/da-dk/welcome.dialog b/dialog/da-dk/welcome.dialog
deleted file mode 100644
index 7bb6989..0000000
--- a/dialog/da-dk/welcome.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-velbekomme
-Jeg er glad for at kunen hjælpe
-Jeg er glad for at hjælpe
-Selv tak
-Intet problem
-du er velkommen
diff --git a/dialog/de-de/hello.world.dialog b/dialog/de-de/hello.world.dialog
deleted file mode 100644
index 182ab0a..0000000
--- a/dialog/de-de/hello.world.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Hallo Welt
-Hallo
-Dir ebenfalls guten Tag
diff --git a/dialog/de-de/how.are.you.dialog b/dialog/de-de/how.are.you.dialog
deleted file mode 100644
index 5f95fa1..0000000
--- a/dialog/de-de/how.are.you.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-mir geht es gut
-ziemlich gut
-Nicht schlecht
-mir geht es ausgezeichnet
-Mir könnte es besser gehen
-mir geht es sehr gut
diff --git a/dialog/de-de/welcome.dialog b/dialog/de-de/welcome.dialog
deleted file mode 100644
index 56637d6..0000000
--- a/dialog/de-de/welcome.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-jeder Zeit.
-Stehe gerne zur verfügung.
-Ich bin froh, dass ich helfen kann.
-Gern geschehen.
-Kein Problem.
-Bitte schön.
diff --git a/dialog/el-gr/hello.world.dialog b/dialog/el-gr/hello.world.dialog
deleted file mode 100644
index 42847af..0000000
--- a/dialog/el-gr/hello.world.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Καλημέρα κόσμε
-Γεια σου
-Γεια και σε σένα
diff --git a/dialog/el-gr/how.are.you.dialog b/dialog/el-gr/how.are.you.dialog
deleted file mode 100644
index 39ca151..0000000
--- a/dialog/el-gr/how.are.you.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-Είμαι μια χαρά
-Μια χαρά
-Όχι κι άσχημα
-Είμαι τέλεια
-Θα μπορούσα και καλύτερα
-Είμαι πολύ καλά
diff --git a/dialog/el-gr/welcome.dialog b/dialog/el-gr/welcome.dialog
deleted file mode 100644
index 9ccf075..0000000
--- a/dialog/el-gr/welcome.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-Όποτε θες.
-Χαίρομαι που σε εξυπηρέτησα.
-Χαίρομαι που βοήθησα.
-Μετά Χαράς.
-Κανένα πρόβλημα.
-Παρακαλώ.
diff --git a/dialog/en-us/hello.world.dialog b/dialog/en-us/hello.world.dialog
deleted file mode 100644
index 811f098..0000000
--- a/dialog/en-us/hello.world.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Hello world
-Hello
-Hi to you too
diff --git a/dialog/en-us/how.are.you.dialog b/dialog/en-us/how.are.you.dialog
deleted file mode 100644
index af69447..0000000
--- a/dialog/en-us/how.are.you.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-I'm doing well
-Pretty well
-Not bad
-I'm doing excellent
-Could be better
-I'm doing very well
diff --git a/dialog/en-us/welcome.dialog b/dialog/en-us/welcome.dialog
deleted file mode 100644
index 2f6491e..0000000
--- a/dialog/en-us/welcome.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-Any time.
-Glad to be of service.
-Glad to help.
-My Pleasure.
-No problem.
-You're welcome.
diff --git a/dialog/es-es/hello.world.dialog b/dialog/es-es/hello.world.dialog
deleted file mode 100644
index 161a512..0000000
--- a/dialog/es-es/hello.world.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Hola mundo
-Hola
-Hola a ti también
diff --git a/dialog/es-es/how.are.you.dialog b/dialog/es-es/how.are.you.dialog
deleted file mode 100644
index 7253532..0000000
--- a/dialog/es-es/how.are.you.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-Estoy bien
-Bastante bien
-Nada mal
-Estoy de maravilla
-Podría estar mejor
-Estoy muy bien
diff --git a/dialog/es-es/welcome.dialog b/dialog/es-es/welcome.dialog
deleted file mode 100644
index 16908c3..0000000
--- a/dialog/es-es/welcome.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-En cualquier momento.
-Me alegra ser de ayuda.
-Feliz de ayudarte.
-El placer es mío.
-No hay problema.
-De nada.
diff --git a/dialog/eu-eu/hello.world.dialog b/dialog/eu-eu/hello.world.dialog
deleted file mode 100644
index 90ac0c4..0000000
--- a/dialog/eu-eu/hello.world.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Kaixo mundua!
-Kaixo!
-Kaixo zuri ere!
diff --git a/dialog/eu-eu/how.are.you.dialog b/dialog/eu-eu/how.are.you.dialog
deleted file mode 100644
index 9364aec..0000000
--- a/dialog/eu-eu/how.are.you.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-Ondo nago.
-Nahiko ondo.
-Ondo esan beharko.
-Primeran nago.
-Hobeto egon liteke.
-Oso ondo nago.
diff --git a/dialog/eu-eu/welcome.dialog b/dialog/eu-eu/welcome.dialog
deleted file mode 100644
index f38cc86..0000000
--- a/dialog/eu-eu/welcome.dialog
+++ /dev/null
@@ -1,7 +0,0 @@
-Edozein unetan.
-Nahi duzunean.
-Pozten naiz laguntzeaz.
-Ez horregatik.
-Plazera nirea da.
-Ez dago arazorik.
-Deusetaz.
\ No newline at end of file
diff --git a/dialog/fa-ir/hello.world.dialog b/dialog/fa-ir/hello.world.dialog
deleted file mode 100644
index 5243d34..0000000
--- a/dialog/fa-ir/hello.world.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-سلام بر همه
-سلام
-علیکِ سلام
diff --git a/dialog/fa-ir/how.are.you.dialog b/dialog/fa-ir/how.are.you.dialog
deleted file mode 100644
index 1e23e39..0000000
--- a/dialog/fa-ir/how.are.you.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-من خوبم
-خیلی خوب
-بدک نیستم
-عالیَم
-می شد بهتر باشم
-خیلی خوبم
diff --git a/dialog/fa-ir/welcome.dialog b/dialog/fa-ir/welcome.dialog
deleted file mode 100644
index d149a5d..0000000
--- a/dialog/fa-ir/welcome.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-هر زمانی
-خوشحالم که در خدمتِ شُمام
-خوشحالم که کمک می کنم
-باعث خوشحالیه
-مسئله ای نیست
-خواهش می کنم
diff --git a/dialog/fr-fr/hello.world.dialog b/dialog/fr-fr/hello.world.dialog
deleted file mode 100644
index 31388a9..0000000
--- a/dialog/fr-fr/hello.world.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Bonjour le monde
-Salut
-Salut à toi aussi
diff --git a/dialog/fr-fr/how.are.you.dialog b/dialog/fr-fr/how.are.you.dialog
deleted file mode 100644
index c946a2e..0000000
--- a/dialog/fr-fr/how.are.you.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-Je vais bien
-Plutôt bien
-pas mal
-Je vais très bien
-Ça pourrait être mieux
-Je vais très bien
diff --git a/dialog/fr-fr/welcome.dialog b/dialog/fr-fr/welcome.dialog
deleted file mode 100644
index bb82976..0000000
--- a/dialog/fr-fr/welcome.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-N'importe quand.
-Ravi d'être utile.
-Heureux de vous aider.
-Y'a pas de quoi.
-Pas de problème.
-Je vous en prie.
diff --git a/dialog/gl-es/hello.world.dialog b/dialog/gl-es/hello.world.dialog
deleted file mode 100644
index 58a116e..0000000
--- a/dialog/gl-es/hello.world.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Ola mundo
-Ola
-Ola para ti tamén
diff --git a/dialog/gl-es/how.are.you.dialog b/dialog/gl-es/how.are.you.dialog
deleted file mode 100644
index 9c6be8d..0000000
--- a/dialog/gl-es/how.are.you.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-Estou ben
-Moi ben
-Nada mal
-Estou moi ben
-Podería estar mellor
-Estou indo moi ben
diff --git a/dialog/gl-es/welcome.dialog b/dialog/gl-es/welcome.dialog
deleted file mode 100644
index 8ec9ef5..0000000
--- a/dialog/gl-es/welcome.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-Cando queiras.
-Feliz de poder axudarche.
-Feliz de axudar.
-O pracer é meu.
-Ningún problema.
-De nada.
diff --git a/dialog/hu-hu/hello.world.dialog b/dialog/hu-hu/hello.world.dialog
deleted file mode 100644
index 0bf58fb..0000000
--- a/dialog/hu-hu/hello.world.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Helló világ
-Helló
-Üdv neked is
diff --git a/dialog/hu-hu/how.are.you.dialog b/dialog/hu-hu/how.are.you.dialog
deleted file mode 100644
index a4f52ca..0000000
--- a/dialog/hu-hu/how.are.you.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-Jól vagyok
-Egész jól
-Megvagyok
-Kiválóan
-Lehetnék jobban is
-Nagyon jól vagyok
diff --git a/dialog/hu-hu/welcome.dialog b/dialog/hu-hu/welcome.dialog
deleted file mode 100644
index 0ff5c93..0000000
--- a/dialog/hu-hu/welcome.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-Máskor is.
-Állok szolgálatodra.
-Örülök, hogy segíthettem.
-Örömmel segítek.
-Szívesen.
-Kérem.
diff --git a/dialog/it-it/hello.world.dialog b/dialog/it-it/hello.world.dialog
deleted file mode 100644
index edd3bf8..0000000
--- a/dialog/it-it/hello.world.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Ciao mondo
-Ciao
-Ciao anche a te
diff --git a/dialog/it-it/how.are.you.dialog b/dialog/it-it/how.are.you.dialog
deleted file mode 100644
index 74e61b0..0000000
--- a/dialog/it-it/how.are.you.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-Va tutto bene
-Abbastanza bene
-Non male
-Va uno spettacolo
-Potrebbe andar meglio
-Va molto bene
diff --git a/dialog/it-it/welcome.dialog b/dialog/it-it/welcome.dialog
deleted file mode 100644
index 25f2556..0000000
--- a/dialog/it-it/welcome.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-Quando vuoi.
-Felice di essere utile.
-Mi ha fatto piacere aiutarti.
-Non c'è di che.
-Nessun problema.
-Di niente.
diff --git a/dialog/nl-nl/hello.world.dialog b/dialog/nl-nl/hello.world.dialog
deleted file mode 100644
index 35516ae..0000000
--- a/dialog/nl-nl/hello.world.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Hallo wereld
-Hallo
-Ook hallo
diff --git a/dialog/nl-nl/how.are.you.dialog b/dialog/nl-nl/how.are.you.dialog
deleted file mode 100644
index 0606987..0000000
--- a/dialog/nl-nl/how.are.you.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-Het gaat goed met mij
-Best goed
-Niet slecht
-Het gaat uitstekend met mij
-Kan beter
-Het gaat heel goed met mij
diff --git a/dialog/nl-nl/welcome.dialog b/dialog/nl-nl/welcome.dialog
deleted file mode 100644
index d9d600b..0000000
--- a/dialog/nl-nl/welcome.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-Wanneer je maar wilt.
-Fijn om hiermee van dienst te zijn geweest.
-Fijn om hiermee te kunnen helpen.
-Graag gedaan.
-Geen probleem.
-Graag gedaan.
diff --git a/dialog/pl-pl/hello.world.dialog b/dialog/pl-pl/hello.world.dialog
deleted file mode 100644
index 63bb262..0000000
--- a/dialog/pl-pl/hello.world.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Witaj świecie
-Witaj
-I ty witaj
diff --git a/dialog/pl-pl/how.are.you.dialog b/dialog/pl-pl/how.are.you.dialog
deleted file mode 100644
index 5f006cc..0000000
--- a/dialog/pl-pl/how.are.you.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-Mam się dobrze
-Dość dobrze
-Nieźle
-Mam się świetnie
-Mogłoby być lepiej
-Mam się bardzo dobrze
diff --git a/dialog/pl-pl/welcome.dialog b/dialog/pl-pl/welcome.dialog
deleted file mode 100644
index eb26e6c..0000000
--- a/dialog/pl-pl/welcome.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-W każdej chwili
-Cieszę się że mogę pomóc.
-Cieszę się że mogę pomóc.
-Przyjemność po mojej stronie.
-Nie ma problemu.
-Nie ma za co.
diff --git a/dialog/pt-br/hello.world.dialog b/dialog/pt-br/hello.world.dialog
deleted file mode 100644
index a145ec1..0000000
--- a/dialog/pt-br/hello.world.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Olá mundo
-Olá
-Oi para você também
diff --git a/dialog/pt-br/how.are.you.dialog b/dialog/pt-br/how.are.you.dialog
deleted file mode 100644
index 3f60517..0000000
--- a/dialog/pt-br/how.are.you.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-estou indo bem
-Muito bem
-Nada mau
-Eu estou ótimo
-Poderia estar melhor
-Eu estou indo muito bem
diff --git a/dialog/pt-br/welcome.dialog b/dialog/pt-br/welcome.dialog
deleted file mode 100644
index 36fcb63..0000000
--- a/dialog/pt-br/welcome.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-A qualquer momento.
-Feliz em poder ajudar
-Feliz em ajudar
-O Prazer é meu
-Não tem problema.
-De nada.
diff --git a/dialog/ro-ro/hello.world.dialog b/dialog/ro-ro/hello.world.dialog
deleted file mode 100644
index 58ba6e3..0000000
--- a/dialog/ro-ro/hello.world.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Salut Lume
-Bună
-Bună și tie
diff --git a/dialog/ro-ro/how.are.you.dialog b/dialog/ro-ro/how.are.you.dialog
deleted file mode 100644
index 352ecda..0000000
--- a/dialog/ro-ro/how.are.you.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-fac bine
-Destul de bine
-Nu-i rău
-Mă descurc excelent
-Ar putea fi mai bine
-Fac foarte bine
diff --git a/dialog/ro-ro/welcome.dialog b/dialog/ro-ro/welcome.dialog
deleted file mode 100644
index cb24d03..0000000
--- a/dialog/ro-ro/welcome.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-Oricând.
-Mă bucur să fiu de folos.
-Bucuros sa ajut.
-Plăcerea este de partea mea.
-Nici o problema.
-Cu plăcere.
diff --git a/dialog/ru-ru/hello.world.dialog b/dialog/ru-ru/hello.world.dialog
deleted file mode 100644
index 64064a1..0000000
--- a/dialog/ru-ru/hello.world.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Привет, мир 
-Здравствуй
-И тебе привет
diff --git a/dialog/ru-ru/how.are.you.dialog b/dialog/ru-ru/how.are.you.dialog
deleted file mode 100644
index 25884d5..0000000
--- a/dialog/ru-ru/how.are.you.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-У меня все хорошо
-Довольно неплохо
-Неплохо
-У меня все замечательно 
-Могло быть и получше
-У меня все очень хорошо
diff --git a/dialog/ru-ru/welcome.dialog b/dialog/ru-ru/welcome.dialog
deleted file mode 100644
index 4b9f7a3..0000000
--- a/dialog/ru-ru/welcome.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-Всегда пожалуйста
-Я рад услужить 
-Рад помочь
-Мое удовольствие
-Без проблем 
-Пожалуйста
diff --git a/dialog/sv-se/hello.world.dialog b/dialog/sv-se/hello.world.dialog
deleted file mode 100644
index 7995553..0000000
--- a/dialog/sv-se/hello.world.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Hallå världen
-Hallå
-Hej på dig med
diff --git a/dialog/sv-se/how.are.you.dialog b/dialog/sv-se/how.are.you.dialog
deleted file mode 100644
index f9827d2..0000000
--- a/dialog/sv-se/how.are.you.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-Jag mår bra
-Ganska bra
-Inte så tokigt
-Jag mår prima
-Kunde vart bättre
-Jag mår ganska fint
diff --git a/dialog/sv-se/welcome.dialog b/dialog/sv-se/welcome.dialog
deleted file mode 100644
index c1ab6aa..0000000
--- a/dialog/sv-se/welcome.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-Det var det lilla.
-Glad att kunna hjälpa till.
-Kul att kunna hjälpa.
-Nöjet var på min sida.
-Inga problem.
-Var så god.
diff --git a/dialog/tr-tr/hello.world.dialog b/dialog/tr-tr/hello.world.dialog
deleted file mode 100644
index b0a1537..0000000
--- a/dialog/tr-tr/hello.world.dialog
+++ /dev/null
@@ -1,3 +0,0 @@
-Merhaba dünya
-Merhaba
-sana da selam
diff --git a/dialog/tr-tr/how.are.you.dialog b/dialog/tr-tr/how.are.you.dialog
deleted file mode 100644
index 1eb5807..0000000
--- a/dialog/tr-tr/how.are.you.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-iyiyim
-Çok iyi
-Fena değil
-Ben mükemmelim
-Daha iyi olabilir
-Ben çok iyiyim
diff --git a/dialog/tr-tr/welcome.dialog b/dialog/tr-tr/welcome.dialog
deleted file mode 100644
index 77429ca..0000000
--- a/dialog/tr-tr/welcome.dialog
+++ /dev/null
@@ -1,6 +0,0 @@
-İstediğin zaman.
-Hizmet verdiğim için mutluyum.
-Yardım etmekten memnun oldum.
-Zevkle.
-Sorun değil.
-Rica ederim.
diff --git a/setup.py b/setup.py
index b49c6d1..d173abc 100755
--- a/setup.py
+++ b/setup.py
@@ -1,25 +1,57 @@
 #!/usr/bin/env python3
 from setuptools import setup
+from os import walk, path
 
+URL = "https://github.com/OpenVoiceOS/skill-ovos-hello-world"
+SKILL_CLAZZ = "HelloWorldSkill"  # needs to match __init__.py class name
+PYPI_NAME = "ovos-skill-hello-world"  # pip install PYPI_NAME
+
+# below derived from github url to ensure standard skill_id
+SKILL_AUTHOR, SKILL_NAME = URL.split(".com/")[-1].split("/")
+SKILL_PKG = SKILL_NAME.lower().replace('-', '_')
+PLUGIN_ENTRY_POINT = f'{SKILL_NAME.lower()}.{SKILL_AUTHOR.lower()}={SKILL_PKG}:{SKILL_CLAZZ}'
 # skill_id=package_name:SkillClass
-PLUGIN_ENTRY_POINT = 'mycroft-hello-world.mycroftai=ovos_skill_hello_world:HelloWorldSkill'
-# in this case the skill_id is defined to purposefully replace the mycroft version of the skill,
-# or rather to be replaced by it in case it is present. all skill directories take precedence over plugin skills
+
+
+def find_resource_files():
+    resource_base_dirs = ("locale", "ui", "vocab", "dialog", "regex", "skill")
+    base_dir = path.dirname(__file__)
+    package_data = ["*.json"]
+    for res in resource_base_dirs:
+        if path.isdir(path.join(base_dir, res)):
+            for (directory, _, files) in walk(path.join(base_dir, res)):
+                if files:
+                    package_data.append(
+                        path.join(directory.replace(base_dir, "").lstrip('/'),
+                                  '*'))
+    return package_data
+
+
+with open("README.md", "r") as f:
+    long_description = f.read()
+
+with open("./version.py", "r", encoding="utf-8") as v:
+    for line in v.readlines():
+        if line.startswith("__version__"):
+            if '"' in line:
+                version = line.split('"')[1]
+            else:
+                version = line.split("'")[1]
+
 
 setup(
-    # this is the package name that goes on pip
-    name='ovos-skill-hello-world',
-    version='0.0.1',
+    name=PYPI_NAME,
+    version=version,
+    long_description=long_description,
+    url=URL,
+    author=SKILL_AUTHOR,
     description='OVOS hello world skill plugin',
-    url='https://github.com/OpenVoiceOS/ovos-skill-hello-world',
-    author='JarbasAi',
     author_email='jarbasai@mailfence.com',
     license='Apache-2.0',
-    package_dir={"ovos_skill_hello_world": ""},
-    package_data={'ovos_skill_hello_world': ['locale/*', 'vocab/*', "dialog/*"]},
-    packages=['ovos_skill_hello_world'],
+    package_dir={SKILL_PKG: ""},
+    package_data={SKILL_PKG: find_resource_files()},
+    packages=[SKILL_PKG],
     include_package_data=True,
-    install_requires=["ovos-plugin-manager>=0.0.1a3"],
     keywords='ovos skill plugin',
     entry_points={'ovos.plugin.skill': PLUGIN_ENTRY_POINT}
 )
diff --git a/test/behave/hello-world.feature b/test/behave/hello-world.feature
deleted file mode 100644
index ae1770c..0000000
--- a/test/behave/hello-world.feature
+++ /dev/null
@@ -1,16 +0,0 @@
-Feature: mycroft-hello-world
-
-  Scenario: Hello world
-    Given an english speaking user
-     When the user says "Hello world"
-     Then "mycroft-hello-world" should reply with "Hello world"
-
-  Scenario: How are you
-    Given an english speaking user
-     When the user says "How has your day been"
-     Then "mycroft-hello-world" should reply with dialog from "how.are.you.dialog"
-
-  Scenario: Thank you
-    Given an english speaking user
-     When the user says "Thank you"
-     Then "mycroft-hello-world" should reply with "You're welcome."
diff --git a/test/intent/sample1.intent.json b/test/intent/sample1.intent.json
deleted file mode 100644
index 4b4b94b..0000000
--- a/test/intent/sample1.intent.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "utterance": "Thank you",
-  "intent_type": "ThankYouIntent",
-  "intent": {
-    "ThankYouKeyword": "thank you"
-  }
-}
diff --git a/test/intent/sample2.intent.json b/test/intent/sample2.intent.json
deleted file mode 100644
index 78ac193..0000000
--- a/test/intent/sample2.intent.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "utterance": "Thanks",
-  "intent_type": "ThankYouIntent",
-  "intent": {
-    "ThankYouKeyword": "thanks"
-  }
-}
diff --git a/test/intent/sample3.intent.json b/test/intent/sample3.intent.json
deleted file mode 100644
index 71f8295..0000000
--- a/test/intent/sample3.intent.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "utterance": "Hello world",
-  "intent_type": "HelloWorldIntent",
-  "intent": {
-    "HelloWorldKeyword": "hello world"
-  }
-}
diff --git a/test/intent/sample4.intent.json b/test/intent/sample4.intent.json
deleted file mode 100644
index 938cd6b..0000000
--- a/test/intent/sample4.intent.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "utterance": "Greetings",
-  "intent_type": "HelloWorldIntent",
-  "intent": {
-    "HelloWorldKeyword": "greetings"
-  }
-}
diff --git a/test/intent/sample5.intent.json b/test/intent/sample5.intent.json
deleted file mode 100644
index dab636f..0000000
--- a/test/intent/sample5.intent.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "utterance": "How are you doing",
-  "intent_type": "HowAreYou.intent",
-  "expected_dialog": "how.are.you"
-}
diff --git a/test/intent/sample6.intent.json b/test/intent/sample6.intent.json
deleted file mode 100644
index 2a98915..0000000
--- a/test/intent/sample6.intent.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "utterance": "How has your day been",
-  "intent_type": "HowAreYou.intent",
-  "expected_dialog": "how.are.you"
-}
diff --git a/vocab/ca-es/HelloWorldKeyword.voc b/vocab/ca-es/HelloWorldKeyword.voc
deleted file mode 100644
index 934601d..0000000
--- a/vocab/ca-es/HelloWorldKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-hola món
-salutacions
diff --git a/vocab/ca-es/HowAreYou.intent b/vocab/ca-es/HowAreYou.intent
deleted file mode 100644
index 8b36009..0000000
--- a/vocab/ca-es/HowAreYou.intent
+++ /dev/null
@@ -1,3 +0,0 @@
-(Què (fas|fem)|Com (va|va tot|estàs|anem))?
-com ha anat
-com ha provat el dia
diff --git a/vocab/ca-es/ThankYouKeyword.voc b/vocab/ca-es/ThankYouKeyword.voc
deleted file mode 100644
index bec70ab..0000000
--- a/vocab/ca-es/ThankYouKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-gràcies
-gràcies
diff --git a/vocab/cs-cz/HelloWorldKeyword.voc b/vocab/cs-cz/HelloWorldKeyword.voc
deleted file mode 100644
index 4f24df4..0000000
--- a/vocab/cs-cz/HelloWorldKeyword.voc
+++ /dev/null
@@ -1,3 +0,0 @@
-hello world
-ahoj světe
-zdravím
diff --git a/vocab/cs-cz/HowAreYou.intent b/vocab/cs-cz/HowAreYou.intent
deleted file mode 100644
index 9a5e895..0000000
--- a/vocab/cs-cz/HowAreYou.intent
+++ /dev/null
@@ -1,3 +0,0 @@
-jak se (máš|)
-jak jsi se měl
-jaký byl tvůj den
\ No newline at end of file
diff --git a/vocab/cs-cz/ThankYouKeyword.voc b/vocab/cs-cz/ThankYouKeyword.voc
deleted file mode 100644
index a23ac66..0000000
--- a/vocab/cs-cz/ThankYouKeyword.voc
+++ /dev/null
@@ -1,3 +0,0 @@
-děkuji ti
-díky
-děkuji
\ No newline at end of file
diff --git a/vocab/da-dk/HelloWorldKeyword.voc b/vocab/da-dk/HelloWorldKeyword.voc
deleted file mode 100644
index 4e7d5be..0000000
--- a/vocab/da-dk/HelloWorldKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-Hej verden
-velkommen
diff --git a/vocab/da-dk/HowAreYou.intent b/vocab/da-dk/HowAreYou.intent
deleted file mode 100644
index 9869753..0000000
--- a/vocab/da-dk/HowAreYou.intent
+++ /dev/null
@@ -1,3 +0,0 @@
-hvordan har du det (har det)
-hvordan har du haft det
-hvordan er din dag gået
diff --git a/vocab/da-dk/ThankYouKeyword.voc b/vocab/da-dk/ThankYouKeyword.voc
deleted file mode 100644
index 82126e7..0000000
--- a/vocab/da-dk/ThankYouKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-tak
-mange tak
diff --git a/vocab/de-de/HelloWorldKeyword.voc b/vocab/de-de/HelloWorldKeyword.voc
deleted file mode 100644
index 4deaa26..0000000
--- a/vocab/de-de/HelloWorldKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-Hallo Welt
-schöne Grüße
diff --git a/vocab/de-de/HowAreYou.intent b/vocab/de-de/HowAreYou.intent
deleted file mode 100644
index e5a9f29..0000000
--- a/vocab/de-de/HowAreYou.intent
+++ /dev/null
@@ -1,3 +0,0 @@
-Wie geht es dir?
-wie ist es dir gegangen
-wie war dein Tag
diff --git a/vocab/de-de/ThankYouKeyword.voc b/vocab/de-de/ThankYouKeyword.voc
deleted file mode 100644
index fa093ea..0000000
--- a/vocab/de-de/ThankYouKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-danke
-danke
diff --git a/vocab/el-gr/HelloWorldKeyword.voc b/vocab/el-gr/HelloWorldKeyword.voc
deleted file mode 100644
index bc05484..0000000
--- a/vocab/el-gr/HelloWorldKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-γεια σου κόσμε
-χαιρετίσματα
diff --git a/vocab/el-gr/HowAreYou.intent b/vocab/el-gr/HowAreYou.intent
deleted file mode 100644
index e0bfad8..0000000
--- a/vocab/el-gr/HowAreYou.intent
+++ /dev/null
@@ -1,3 +0,0 @@
-πώς είσαι
-πώς τα περνάς
-πώς ήταν η μέρα σου
diff --git a/vocab/el-gr/ThankYouKeyword.voc b/vocab/el-gr/ThankYouKeyword.voc
deleted file mode 100644
index e691c27..0000000
--- a/vocab/el-gr/ThankYouKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-σε ευχαριστώ
-ευχαριστώ
diff --git a/vocab/en-us/HelloWorldKeyword.voc b/vocab/en-us/HelloWorldKeyword.voc
deleted file mode 100644
index 5ffa264..0000000
--- a/vocab/en-us/HelloWorldKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-hello world
-greetings
diff --git a/vocab/en-us/HowAreYou.intent b/vocab/en-us/HowAreYou.intent
deleted file mode 100644
index 2744451..0000000
--- a/vocab/en-us/HowAreYou.intent
+++ /dev/null
@@ -1,3 +0,0 @@
-how are you (doing|)
-how have you been
-how has your day been
diff --git a/vocab/en-us/ThankYouKeyword.voc b/vocab/en-us/ThankYouKeyword.voc
deleted file mode 100644
index d280f1b..0000000
--- a/vocab/en-us/ThankYouKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-thank you
-thanks
diff --git a/vocab/es-es/HelloWorldKeyword.voc b/vocab/es-es/HelloWorldKeyword.voc
deleted file mode 100644
index 9cdee66..0000000
--- a/vocab/es-es/HelloWorldKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-hola mundo
-saludos
diff --git a/vocab/es-es/HowAreYou.intent b/vocab/es-es/HowAreYou.intent
deleted file mode 100644
index 5c6bc6c..0000000
--- a/vocab/es-es/HowAreYou.intent
+++ /dev/null
@@ -1,3 +0,0 @@
-¿Qué tal|Cómo estas?
-cómo te ha ido
-cómo ha ido el día
diff --git a/vocab/es-es/ThankYouKeyword.voc b/vocab/es-es/ThankYouKeyword.voc
deleted file mode 100644
index 372ddb9..0000000
--- a/vocab/es-es/ThankYouKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-gracias
-gracias
diff --git a/vocab/eu-eu/HelloWorldKeyword.voc b/vocab/eu-eu/HelloWorldKeyword.voc
deleted file mode 100644
index bc5a0e1..0000000
--- a/vocab/eu-eu/HelloWorldKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-kaixo mundua
-kaixo mycroft
\ No newline at end of file
diff --git a/vocab/eu-eu/HowAreYou.intent b/vocab/eu-eu/HowAreYou.intent
deleted file mode 100644
index 3fbc505..0000000
--- a/vocab/eu-eu/HowAreYou.intent
+++ /dev/null
@@ -1,3 +0,0 @@
-(zer moduz|zelan) (eguna|zaude|zabiltza|zabiltz|zagoz|)
-(ongi|ondo) (al|) (zaude|zabiltza|zabiltz|zagoz)
-(nola|zelan|zer moduz|ongi|ondo) (joan da|joan zaizu|doakizu|doa|doa zure|) eguna
\ No newline at end of file
diff --git a/vocab/eu-eu/ThankYouKeyword.voc b/vocab/eu-eu/ThankYouKeyword.voc
deleted file mode 100644
index 03efe5f..0000000
--- a/vocab/eu-eu/ThankYouKeyword.voc
+++ /dev/null
@@ -1,4 +0,0 @@
-Eskerrik asko
-Milesker
-Mila esker
-Esker mila
diff --git a/vocab/fa-ir/HelloWorldKeyword.voc b/vocab/fa-ir/HelloWorldKeyword.voc
deleted file mode 100644
index 4047a1d..0000000
--- a/vocab/fa-ir/HelloWorldKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-سلام دنیا
-خوش اومدی
diff --git a/vocab/fa-ir/HowAreYou.intent b/vocab/fa-ir/HowAreYou.intent
deleted file mode 100644
index 2618592..0000000
--- a/vocab/fa-ir/HowAreYou.intent
+++ /dev/null
@@ -1,3 +0,0 @@
-چطوری (|خوبی)
-چطور هستی
-روزت چطور بوده
diff --git a/vocab/fa-ir/ThankYouKeyword.voc b/vocab/fa-ir/ThankYouKeyword.voc
deleted file mode 100644
index f2d5305..0000000
--- a/vocab/fa-ir/ThankYouKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-ممنون
-سپاس
diff --git a/vocab/fr-fr/HelloWorldKeyword.voc b/vocab/fr-fr/HelloWorldKeyword.voc
deleted file mode 100644
index 35e44f6..0000000
--- a/vocab/fr-fr/HelloWorldKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-Bonjour tout le monde
-salutations
diff --git a/vocab/fr-fr/HowAreYou.intent b/vocab/fr-fr/HowAreYou.intent
deleted file mode 100644
index 76c6d69..0000000
--- a/vocab/fr-fr/HowAreYou.intent
+++ /dev/null
@@ -1,3 +0,0 @@
-Comment allez vous?
-comment avez-vous été
-comment s'est passée votre journée
diff --git a/vocab/fr-fr/ThankYouKeyword.voc b/vocab/fr-fr/ThankYouKeyword.voc
deleted file mode 100644
index 6e87586..0000000
--- a/vocab/fr-fr/ThankYouKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-merci
-merci
diff --git a/vocab/gl-es/HelloWorldKeyword.voc b/vocab/gl-es/HelloWorldKeyword.voc
deleted file mode 100644
index 299cbdd..0000000
--- a/vocab/gl-es/HelloWorldKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-ola mundo
-saúdos
diff --git a/vocab/gl-es/HowAreYou.intent b/vocab/gl-es/HowAreYou.intent
deleted file mode 100644
index 52b3628..0000000
--- a/vocab/gl-es/HowAreYou.intent
+++ /dev/null
@@ -1,3 +0,0 @@
-como estás
-como estiveches
-como foi o teu día
diff --git a/vocab/gl-es/ThankYouKeyword.voc b/vocab/gl-es/ThankYouKeyword.voc
deleted file mode 100644
index cea874b..0000000
--- a/vocab/gl-es/ThankYouKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-grazas
-grazas
diff --git a/vocab/hu-hu/HelloWorldKeyword.voc b/vocab/hu-hu/HelloWorldKeyword.voc
deleted file mode 100644
index 91babd7..0000000
--- a/vocab/hu-hu/HelloWorldKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-helló világ
-üdv
diff --git a/vocab/hu-hu/HowAreYou.intent b/vocab/hu-hu/HowAreYou.intent
deleted file mode 100644
index ca2d0dc..0000000
--- a/vocab/hu-hu/HowAreYou.intent
+++ /dev/null
@@ -1,3 +0,0 @@
-hogy vagy
-hogy telt a napod
-milyen volt a napod
diff --git a/vocab/hu-hu/ThankYouKeyword.voc b/vocab/hu-hu/ThankYouKeyword.voc
deleted file mode 100644
index 2813d90..0000000
--- a/vocab/hu-hu/ThankYouKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-köszönöm
-Köszönöm!
diff --git a/vocab/it-it/HelloWorldKeyword.voc b/vocab/it-it/HelloWorldKeyword.voc
deleted file mode 100644
index eddbdc9..0000000
--- a/vocab/it-it/HelloWorldKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-ciao mondo
-saluti
diff --git a/vocab/it-it/HowAreYou.intent b/vocab/it-it/HowAreYou.intent
deleted file mode 100644
index 74d3535..0000000
--- a/vocab/it-it/HowAreYou.intent
+++ /dev/null
@@ -1,3 +0,0 @@
-come (va| stai)
-com'è stata la tua giornata
-com'è stata la tua giornata
diff --git a/vocab/it-it/ThankYouKeyword.voc b/vocab/it-it/ThankYouKeyword.voc
deleted file mode 100644
index 325f7a7..0000000
--- a/vocab/it-it/ThankYouKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-grazie
-grazie
diff --git a/vocab/nl-nl/HelloWorldKeyword.voc b/vocab/nl-nl/HelloWorldKeyword.voc
deleted file mode 100644
index e305bf7..0000000
--- a/vocab/nl-nl/HelloWorldKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-hallo wereld
-groeten
diff --git a/vocab/nl-nl/HowAreYou.intent b/vocab/nl-nl/HowAreYou.intent
deleted file mode 100644
index 7a56e15..0000000
--- a/vocab/nl-nl/HowAreYou.intent
+++ /dev/null
@@ -1,3 +0,0 @@
-Hoe gaat het (doing|)
-hoe is het met jou gegaan
-hoe is je dag geweest
diff --git a/vocab/nl-nl/ThankYouKeyword.voc b/vocab/nl-nl/ThankYouKeyword.voc
deleted file mode 100644
index ba072df..0000000
--- a/vocab/nl-nl/ThankYouKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-dank je
-bedankt
diff --git a/vocab/pl-pl/HelloWorldKeyword.voc b/vocab/pl-pl/HelloWorldKeyword.voc
deleted file mode 100644
index 0fa380a..0000000
--- a/vocab/pl-pl/HelloWorldKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-witaj świecie
-witam
diff --git a/vocab/pl-pl/HowAreYou.intent b/vocab/pl-pl/HowAreYou.intent
deleted file mode 100644
index 53b7f22..0000000
--- a/vocab/pl-pl/HowAreYou.intent
+++ /dev/null
@@ -1,3 +0,0 @@
-Jak tam (leci|)
-jak się masz
-jak ci minął dzień
diff --git a/vocab/pl-pl/ThankYouKeyword.voc b/vocab/pl-pl/ThankYouKeyword.voc
deleted file mode 100644
index 901fab5..0000000
--- a/vocab/pl-pl/ThankYouKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-dziękuje
-dzięki
diff --git a/vocab/pt-br/HelloWorldKeyword.voc b/vocab/pt-br/HelloWorldKeyword.voc
deleted file mode 100644
index 20b34a2..0000000
--- a/vocab/pt-br/HelloWorldKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-Olá mundo
-saudações
diff --git a/vocab/pt-br/HowAreYou.intent b/vocab/pt-br/HowAreYou.intent
deleted file mode 100644
index 828d635..0000000
--- a/vocab/pt-br/HowAreYou.intent
+++ /dev/null
@@ -1,3 +0,0 @@
-Como você está (indo|)
-como você tem estado
-como foi o seu dia
diff --git a/vocab/pt-br/ThankYouKeyword.voc b/vocab/pt-br/ThankYouKeyword.voc
deleted file mode 100644
index 1a27962..0000000
--- a/vocab/pt-br/ThankYouKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-obrigado
-obrigado
diff --git a/vocab/ro-ro/HelloWorldKeyword.voc b/vocab/ro-ro/HelloWorldKeyword.voc
deleted file mode 100644
index c71baa4..0000000
--- a/vocab/ro-ro/HelloWorldKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-Salut Lume
-Salutari
diff --git a/vocab/ro-ro/HowAreYou.intent b/vocab/ro-ro/HowAreYou.intent
deleted file mode 100644
index 1cc7749..0000000
--- a/vocab/ro-ro/HowAreYou.intent
+++ /dev/null
@@ -1,3 +0,0 @@
-ce (mai|) faci
-cum ai fost
-Cum a fost ziua ta
diff --git a/vocab/ro-ro/ThankYouKeyword.voc b/vocab/ro-ro/ThankYouKeyword.voc
deleted file mode 100644
index e6cc435..0000000
--- a/vocab/ro-ro/ThankYouKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-mulțumesc
-Mulțumiri
diff --git a/vocab/ru-ru/HelloWorldKeyword.voc b/vocab/ru-ru/HelloWorldKeyword.voc
deleted file mode 100644
index 32207cf..0000000
--- a/vocab/ru-ru/HelloWorldKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-привет, мир 
-здравствуй
diff --git a/vocab/ru-ru/HowAreYou.intent b/vocab/ru-ru/HowAreYou.intent
deleted file mode 100644
index e0b749f..0000000
--- a/vocab/ru-ru/HowAreYou.intent
+++ /dev/null
@@ -1,3 +0,0 @@
-как (ваши|) дела
-(как твои дела|как поживаешь)
-как прошел твой день
diff --git a/vocab/ru-ru/ThankYouKeyword.voc b/vocab/ru-ru/ThankYouKeyword.voc
deleted file mode 100644
index 3562ad1..0000000
--- a/vocab/ru-ru/ThankYouKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-спасибо 
-спасиб
diff --git a/vocab/sv-se/HelloWorldKeyword.voc b/vocab/sv-se/HelloWorldKeyword.voc
deleted file mode 100644
index db2721a..0000000
--- a/vocab/sv-se/HelloWorldKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-hallå världen
-var hälsad
diff --git a/vocab/sv-se/HowAreYou.intent b/vocab/sv-se/HowAreYou.intent
deleted file mode 100644
index 9ad672c..0000000
--- a/vocab/sv-se/HowAreYou.intent
+++ /dev/null
@@ -1,3 +0,0 @@
-hur mår du
-hur har du haft det
-hur har din dag varit
diff --git a/vocab/sv-se/ThankYouKeyword.voc b/vocab/sv-se/ThankYouKeyword.voc
deleted file mode 100644
index 641d317..0000000
--- a/vocab/sv-se/ThankYouKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-tack så mycket
-tackar
diff --git a/vocab/tr-tr/HelloWorldKeyword.voc b/vocab/tr-tr/HelloWorldKeyword.voc
deleted file mode 100644
index b49f260..0000000
--- a/vocab/tr-tr/HelloWorldKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-selam dünya
-selamlar
diff --git a/vocab/tr-tr/HowAreYou.intent b/vocab/tr-tr/HowAreYou.intent
deleted file mode 100644
index afdb71b..0000000
--- a/vocab/tr-tr/HowAreYou.intent
+++ /dev/null
@@ -1,3 +0,0 @@
-nasılsın
-nasıl oldun
-Senin günün nasıldı
diff --git a/vocab/tr-tr/ThankYouKeyword.voc b/vocab/tr-tr/ThankYouKeyword.voc
deleted file mode 100644
index a4bcde1..0000000
--- a/vocab/tr-tr/ThankYouKeyword.voc
+++ /dev/null
@@ -1,2 +0,0 @@
-teşkkür ederim
-teşekkürler