diff --git a/labs1-2/README.md b/lab1/README.md
similarity index 100%
rename from labs1-2/README.md
rename to lab1/README.md
diff --git a/labs1-2/grammar/abstract/MicroLang.gf b/lab1/grammar/abstract/MicroLang.gf
similarity index 100%
rename from labs1-2/grammar/abstract/MicroLang.gf
rename to lab1/grammar/abstract/MicroLang.gf
diff --git a/labs1-2/grammar/abstract/MicroLang.labels b/lab1/grammar/abstract/MicroLang.labels
similarity index 100%
rename from labs1-2/grammar/abstract/MicroLang.labels
rename to lab1/grammar/abstract/MicroLang.labels
diff --git a/labs1-2/grammar/abstract/MiniGrammar.gf b/lab1/grammar/abstract/MiniGrammar.gf
similarity index 100%
rename from labs1-2/grammar/abstract/MiniGrammar.gf
rename to lab1/grammar/abstract/MiniGrammar.gf
diff --git a/labs1-2/grammar/abstract/MiniLang.gf b/lab1/grammar/abstract/MiniLang.gf
similarity index 100%
rename from labs1-2/grammar/abstract/MiniLang.gf
rename to lab1/grammar/abstract/MiniLang.gf
diff --git a/labs1-2/grammar/abstract/MiniLang.labels b/lab1/grammar/abstract/MiniLang.labels
similarity index 100%
rename from labs1-2/grammar/abstract/MiniLang.labels
rename to lab1/grammar/abstract/MiniLang.labels
diff --git a/labs1-2/grammar/abstract/MiniLexicon.gf b/lab1/grammar/abstract/MiniLexicon.gf
similarity index 100%
rename from labs1-2/grammar/abstract/MiniLexicon.gf
rename to lab1/grammar/abstract/MiniLexicon.gf
diff --git a/labs1-2/grammar/api/MiniSyntax.gf b/lab1/grammar/api/MiniSyntax.gf
similarity index 100%
rename from labs1-2/grammar/api/MiniSyntax.gf
rename to lab1/grammar/api/MiniSyntax.gf
diff --git a/labs1-2/grammar/api/MiniSyntaxEng.gf b/lab1/grammar/api/MiniSyntaxEng.gf
similarity index 100%
rename from labs1-2/grammar/api/MiniSyntaxEng.gf
rename to lab1/grammar/api/MiniSyntaxEng.gf
diff --git a/labs1-2/grammar/application-2022/Doctor.gf b/lab1/grammar/application-2022/Doctor.gf
similarity index 100%
rename from labs1-2/grammar/application-2022/Doctor.gf
rename to lab1/grammar/application-2022/Doctor.gf
diff --git a/labs1-2/grammar/application-2022/DoctorEng.gf b/lab1/grammar/application-2022/DoctorEng.gf
similarity index 100%
rename from labs1-2/grammar/application-2022/DoctorEng.gf
rename to lab1/grammar/application-2022/DoctorEng.gf
diff --git a/labs1-2/grammar/application-2022/DoctorMiniEng.gf b/lab1/grammar/application-2022/DoctorMiniEng.gf
similarity index 100%
rename from labs1-2/grammar/application-2022/DoctorMiniEng.gf
rename to lab1/grammar/application-2022/DoctorMiniEng.gf
diff --git a/labs1-2/grammar/english/MicroLangEng.gf b/lab1/grammar/english/MicroLangEng.gf
similarity index 100%
rename from labs1-2/grammar/english/MicroLangEng.gf
rename to lab1/grammar/english/MicroLangEng.gf
diff --git a/labs1-2/grammar/english/MicroLangEng.labels b/lab1/grammar/english/MicroLangEng.labels
similarity index 100%
rename from labs1-2/grammar/english/MicroLangEng.labels
rename to lab1/grammar/english/MicroLangEng.labels
diff --git a/labs1-2/grammar/english/MicroResEng.gf b/lab1/grammar/english/MicroResEng.gf
similarity index 100%
rename from labs1-2/grammar/english/MicroResEng.gf
rename to lab1/grammar/english/MicroResEng.gf
diff --git a/labs1-2/grammar/english/MiniGrammarEng.gf b/lab1/grammar/english/MiniGrammarEng.gf
similarity index 100%
rename from labs1-2/grammar/english/MiniGrammarEng.gf
rename to lab1/grammar/english/MiniGrammarEng.gf
diff --git a/labs1-2/grammar/english/MiniLangEng.gf b/lab1/grammar/english/MiniLangEng.gf
similarity index 100%
rename from labs1-2/grammar/english/MiniLangEng.gf
rename to lab1/grammar/english/MiniLangEng.gf
diff --git a/labs1-2/grammar/english/MiniLangEng.labels b/lab1/grammar/english/MiniLangEng.labels
similarity index 100%
rename from labs1-2/grammar/english/MiniLangEng.labels
rename to lab1/grammar/english/MiniLangEng.labels
diff --git a/labs1-2/grammar/english/MiniLexiconEng.gf b/lab1/grammar/english/MiniLexiconEng.gf
similarity index 100%
rename from labs1-2/grammar/english/MiniLexiconEng.gf
rename to lab1/grammar/english/MiniLexiconEng.gf
diff --git a/labs1-2/grammar/english/MiniParadigmsEng.gf b/lab1/grammar/english/MiniParadigmsEng.gf
similarity index 100%
rename from labs1-2/grammar/english/MiniParadigmsEng.gf
rename to lab1/grammar/english/MiniParadigmsEng.gf
diff --git a/labs1-2/grammar/english/MiniResEng.gf b/lab1/grammar/english/MiniResEng.gf
similarity index 100%
rename from labs1-2/grammar/english/MiniResEng.gf
rename to lab1/grammar/english/MiniResEng.gf
diff --git a/labs1-2/grammar/foods/Foods.gf b/lab1/grammar/foods/Foods.gf
similarity index 100%
rename from labs1-2/grammar/foods/Foods.gf
rename to lab1/grammar/foods/Foods.gf
diff --git a/labs1-2/grammar/functor/MicroLangFunctor.gf b/lab1/grammar/functor/MicroLangFunctor.gf
similarity index 100%
rename from labs1-2/grammar/functor/MicroLangFunctor.gf
rename to lab1/grammar/functor/MicroLangFunctor.gf
diff --git a/labs1-2/grammar/functor/MicroLangFunctorEng.gf b/lab1/grammar/functor/MicroLangFunctorEng.gf
similarity index 100%
rename from labs1-2/grammar/functor/MicroLangFunctorEng.gf
rename to lab1/grammar/functor/MicroLangFunctorEng.gf
diff --git a/labs1-2/grammar/functor/MicroLangFunctorSwe.gf b/lab1/grammar/functor/MicroLangFunctorSwe.gf
similarity index 100%
rename from labs1-2/grammar/functor/MicroLangFunctorSwe.gf
rename to lab1/grammar/functor/MicroLangFunctorSwe.gf
diff --git a/labs1-2/grammar/functor/MiniLangFunctor.gf b/lab1/grammar/functor/MiniLangFunctor.gf
similarity index 100%
rename from labs1-2/grammar/functor/MiniLangFunctor.gf
rename to lab1/grammar/functor/MiniLangFunctor.gf
diff --git a/labs1-2/grammar/functor/MiniLangFunctorEng.gf b/lab1/grammar/functor/MiniLangFunctorEng.gf
similarity index 100%
rename from labs1-2/grammar/functor/MiniLangFunctorEng.gf
rename to lab1/grammar/functor/MiniLangFunctorEng.gf
diff --git a/labs1-2/grammar/functor/MiniLangFunctorSwe.gf b/lab1/grammar/functor/MiniLangFunctorSwe.gf
similarity index 100%
rename from labs1-2/grammar/functor/MiniLangFunctorSwe.gf
rename to lab1/grammar/functor/MiniLangFunctorSwe.gf
diff --git a/labs1-2/grammar/intro/MicroLangEng.gf b/lab1/grammar/intro/MicroLangEng.gf
similarity index 100%
rename from labs1-2/grammar/intro/MicroLangEng.gf
rename to lab1/grammar/intro/MicroLangEng.gf
diff --git a/labs1-2/grammar/intro/MicroResEng.gf b/lab1/grammar/intro/MicroResEng.gf
similarity index 100%
rename from labs1-2/grammar/intro/MicroResEng.gf
rename to lab1/grammar/intro/MicroResEng.gf
diff --git a/labs1-2/grammar/italian/MicroLangIta.gf b/lab1/grammar/italian/MicroLangIta.gf
similarity index 100%
rename from labs1-2/grammar/italian/MicroLangIta.gf
rename to lab1/grammar/italian/MicroLangIta.gf
diff --git a/labs1-2/grammar/italian/MicroLangIta.gfo b/lab1/grammar/italian/MicroLangIta.gfo
similarity index 100%
rename from labs1-2/grammar/italian/MicroLangIta.gfo
rename to lab1/grammar/italian/MicroLangIta.gfo
diff --git a/labs1-2/grammar/italian/MicroResIta.gf b/lab1/grammar/italian/MicroResIta.gf
similarity index 100%
rename from labs1-2/grammar/italian/MicroResIta.gf
rename to lab1/grammar/italian/MicroResIta.gf
diff --git a/labs1-2/grammar/italian/MicroResIta.gfo b/lab1/grammar/italian/MicroResIta.gfo
similarity index 100%
rename from labs1-2/grammar/italian/MicroResIta.gfo
rename to lab1/grammar/italian/MicroResIta.gfo
diff --git a/labs1-2/grammar/myproject/MicroLangEng.gf b/lab1/grammar/myproject/MicroLangEng.gf
similarity index 100%
rename from labs1-2/grammar/myproject/MicroLangEng.gf
rename to lab1/grammar/myproject/MicroLangEng.gf
diff --git a/labs1-2/grammar/myproject/MicroLangEng.gfo b/lab1/grammar/myproject/MicroLangEng.gfo
similarity index 100%
rename from labs1-2/grammar/myproject/MicroLangEng.gfo
rename to lab1/grammar/myproject/MicroLangEng.gfo
diff --git a/labs1-2/grammar/myproject/MicroLangSwe.gf b/lab1/grammar/myproject/MicroLangSwe.gf
similarity index 100%
rename from labs1-2/grammar/myproject/MicroLangSwe.gf
rename to lab1/grammar/myproject/MicroLangSwe.gf
diff --git a/labs1-2/grammar/myproject/MicroLangSwe.gfo b/lab1/grammar/myproject/MicroLangSwe.gfo
similarity index 100%
rename from labs1-2/grammar/myproject/MicroLangSwe.gfo
rename to lab1/grammar/myproject/MicroLangSwe.gfo
diff --git a/labs1-2/grammar/myproject/MicroResEng.gf b/lab1/grammar/myproject/MicroResEng.gf
similarity index 100%
rename from labs1-2/grammar/myproject/MicroResEng.gf
rename to lab1/grammar/myproject/MicroResEng.gf
diff --git a/labs1-2/grammar/myproject/MicroResEng.gfo b/lab1/grammar/myproject/MicroResEng.gfo
similarity index 100%
rename from labs1-2/grammar/myproject/MicroResEng.gfo
rename to lab1/grammar/myproject/MicroResEng.gfo
diff --git a/labs1-2/grammar/myproject/MicroResSwe.gf b/lab1/grammar/myproject/MicroResSwe.gf
similarity index 100%
rename from labs1-2/grammar/myproject/MicroResSwe.gf
rename to lab1/grammar/myproject/MicroResSwe.gf
diff --git a/labs1-2/grammar/myproject/MicroResSwe.gfo b/lab1/grammar/myproject/MicroResSwe.gfo
similarity index 100%
rename from labs1-2/grammar/myproject/MicroResSwe.gfo
rename to lab1/grammar/myproject/MicroResSwe.gfo
diff --git a/labs1-2/grammar/test.gfs b/lab1/grammar/test.gfs
similarity index 100%
rename from labs1-2/grammar/test.gfs
rename to lab1/grammar/test.gfs
diff --git a/labs1-2/intro/Intro.gf b/lab1/intro/Intro.gf
similarity index 100%
rename from labs1-2/intro/Intro.gf
rename to lab1/intro/Intro.gf
diff --git a/labs1-2/intro/IntroEng.gf b/lab1/intro/IntroEng.gf
similarity index 100%
rename from labs1-2/intro/IntroEng.gf
rename to lab1/intro/IntroEng.gf
diff --git a/labs1-2/intro/IntroFre.gf b/lab1/intro/IntroFre.gf
similarity index 100%
rename from labs1-2/intro/IntroFre.gf
rename to lab1/intro/IntroFre.gf
diff --git a/labs1-2/intro/english.cf b/lab1/intro/english.cf
similarity index 100%
rename from labs1-2/intro/english.cf
rename to lab1/intro/english.cf
diff --git a/labs1-2/wikipedia-2022/Countries.gf b/lab2/wikipedia-2022/Countries.gf
similarity index 100%
rename from labs1-2/wikipedia-2022/Countries.gf
rename to lab2/wikipedia-2022/Countries.gf
diff --git a/labs1-2/wikipedia-2022/CountriesEng.gf b/lab2/wikipedia-2022/CountriesEng.gf
similarity index 100%
rename from labs1-2/wikipedia-2022/CountriesEng.gf
rename to lab2/wikipedia-2022/CountriesEng.gf
diff --git a/labs1-2/wikipedia-2022/CountriesFin.gf b/lab2/wikipedia-2022/CountriesFin.gf
similarity index 100%
rename from labs1-2/wikipedia-2022/CountriesFin.gf
rename to lab2/wikipedia-2022/CountriesFin.gf
diff --git a/labs1-2/wikipedia-2022/CountriesGer.gf b/lab2/wikipedia-2022/CountriesGer.gf
similarity index 100%
rename from labs1-2/wikipedia-2022/CountriesGer.gf
rename to lab2/wikipedia-2022/CountriesGer.gf
diff --git a/labs1-2/wikipedia-2022/CountriesSwe.gf b/lab2/wikipedia-2022/CountriesSwe.gf
similarity index 100%
rename from labs1-2/wikipedia-2022/CountriesSwe.gf
rename to lab2/wikipedia-2022/CountriesSwe.gf
diff --git a/labs1-2/wikipedia-2022/CountryNames.gf b/lab2/wikipedia-2022/CountryNames.gf
similarity index 100%
rename from labs1-2/wikipedia-2022/CountryNames.gf
rename to lab2/wikipedia-2022/CountryNames.gf
diff --git a/labs1-2/wikipedia-2022/CountryNamesEng.gf b/lab2/wikipedia-2022/CountryNamesEng.gf
similarity index 100%
rename from labs1-2/wikipedia-2022/CountryNamesEng.gf
rename to lab2/wikipedia-2022/CountryNamesEng.gf
diff --git a/labs1-2/wikipedia-2022/CountryNamesFin.gf b/lab2/wikipedia-2022/CountryNamesFin.gf
similarity index 100%
rename from labs1-2/wikipedia-2022/CountryNamesFin.gf
rename to lab2/wikipedia-2022/CountryNamesFin.gf
diff --git a/labs1-2/wikipedia-2022/CountryNamesGer.gf b/lab2/wikipedia-2022/CountryNamesGer.gf
similarity index 100%
rename from labs1-2/wikipedia-2022/CountryNamesGer.gf
rename to lab2/wikipedia-2022/CountryNamesGer.gf
diff --git a/labs1-2/wikipedia-2022/CountryNamesSwe.gf b/lab2/wikipedia-2022/CountryNamesSwe.gf
similarity index 100%
rename from labs1-2/wikipedia-2022/CountryNamesSwe.gf
rename to lab2/wikipedia-2022/CountryNamesSwe.gf
diff --git a/labs1-2/wikipedia-2022/Facts.gf b/lab2/wikipedia-2022/Facts.gf
similarity index 100%
rename from labs1-2/wikipedia-2022/Facts.gf
rename to lab2/wikipedia-2022/Facts.gf
diff --git a/labs1-2/wikipedia-2022/FactsEng.gf b/lab2/wikipedia-2022/FactsEng.gf
similarity index 100%
rename from labs1-2/wikipedia-2022/FactsEng.gf
rename to lab2/wikipedia-2022/FactsEng.gf
diff --git a/labs1-2/wikipedia-2022/FactsFin.gf b/lab2/wikipedia-2022/FactsFin.gf
similarity index 100%
rename from labs1-2/wikipedia-2022/FactsFin.gf
rename to lab2/wikipedia-2022/FactsFin.gf
diff --git a/labs1-2/wikipedia-2022/FactsGer.gf b/lab2/wikipedia-2022/FactsGer.gf
similarity index 100%
rename from labs1-2/wikipedia-2022/FactsGer.gf
rename to lab2/wikipedia-2022/FactsGer.gf
diff --git a/labs1-2/wikipedia-2022/FactsSwe.gf b/lab2/wikipedia-2022/FactsSwe.gf
similarity index 100%
rename from labs1-2/wikipedia-2022/FactsSwe.gf
rename to lab2/wikipedia-2022/FactsSwe.gf
diff --git a/labs1-2/wikipedia-2022/country_facts.py b/lab2/wikipedia-2022/country_facts.py
similarity index 100%
rename from labs1-2/wikipedia-2022/country_facts.py
rename to lab2/wikipedia-2022/country_facts.py
diff --git a/labs1-2/wikipedia-2022/data_facts.py b/lab2/wikipedia-2022/data_facts.py
similarity index 100%
rename from labs1-2/wikipedia-2022/data_facts.py
rename to lab2/wikipedia-2022/data_facts.py
diff --git a/labs1-2/wikipedia-2022/extract_names.py b/lab2/wikipedia-2022/extract_names.py
similarity index 100%
rename from labs1-2/wikipedia-2022/extract_names.py
rename to lab2/wikipedia-2022/extract_names.py