commit 34cf65cde479a4f9a89ca12aa653b9a21877e0e2
Author: petrh <petrh@zcu.cz>
Date:   Thu Apr 30 21:22:38 2020 +0200

    Fixed issues found in code documentation

diff --git a/python-module/DatasetConfigs/JIS.yaml b/python-module/DatasetConfigs/JIS.yaml
index bb1dc20..5a4da46 100644
--- a/python-module/DatasetConfigs/JIS.yaml
+++ b/python-module/DatasetConfigs/JIS.yaml
@@ -8,7 +8,7 @@ regex: OD_ZCU_JIS_[0-9][0-9]_[0-9][0-9][0-9][0-9]_CSV.zip
 update-period: 24
 # pozice jednotlivych zarizeni, ktera jsou v datasetu
 devices:
-  - STUD_KL20:
+  - L1L2-vchod:
       x: UNKNOWN!
       y: UNKNOWN!
 
@@ -16,187 +16,179 @@ devices:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - M14:
-      x: UNKNOWN!
-      y: UNKNOWN!
-
-  - Menza4-kasa5:
-      x: UNKNOWN!
-      y: UNKNOWN!
-
-  - A3:
+  - Zavora-NTIS-vyjezd:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - KolaBory-vnitrni:
+  - EXT/kola:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - US 005 - z�vora vjezd:
+  - Menza4-kasa1:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - Zavora-NTIS-vyjezd:
+  - STUD_KL87:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - EXT/kola:
+  - VC-VJEZD:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - VC-VJEZD:
+  - KolaBory-vnitrni:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - L2:
+  - Menza1-kasa-l:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - L-Posilovna:
+  - Zavora-Kaplirova:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - Zavora-Kaplirova:
+  - STUD_ST407:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - Menza1-kasa-p:
+  - Menza4-kasa4:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - STUD_CHEB:
+  - NTIS-BUFET:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - STUD_KL87:
+  - VC-VYJEZD:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - Zavora-FEL:
+  - L2:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - KL-Posilovna:
+  - STUD_PRA1:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - NTIS-BUFET:
+  - KolaBory-vnejsi:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - Parkoviste-vjezd:
+  - STUD_CHEB:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - STUD_ST407:
+  - STUD_KL20:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - UV1-Bufet:
+  - L-Posilovna:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - Parkoviste-vyjezd:
+  - Menza4-kasa2:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - STUD_PRA1:
+  - Menza4-kasa5:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - L1:
+  - M14:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - EP-BUFET:
+  - A2-Hlavni vchod:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - STUD_UB211:
+  - B3-kolarna:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - KolaBory-vnejsi:
+  - B3-LEVY:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - B3-kolarna:
+  - Zavora-FDU:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - Menza1-kasa-l:
+  - US 005 - m�� vjezd:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - A1:
+  - Zavora-NTIS-vjezd:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - STUD_UB113:
+  - A3:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - VC-VYJEZD:
+  - STUD_UB211:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - STUD_VC53:
+  - KL-Posilovna:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - A2-Hlavni vchod:
+  - Zavora-FEL:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - Menza4-kasa2:
+  - EXT/kola-B:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - L1L2-vchod:
+  - MenzaKL-vydej:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - B3-LEVY:
+  - UV1-Bufet:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - Menza4-kasa1:
+  - STUD_VC53:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - Zavora-FDU:
+  - A1:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - MenzaKL-vydej:
+  - Parkoviste-vjezd:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - Zavora-NTIS-vjezd:
+  - US 005 - z�vora vjezd:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - Menza4-kasa4:
+  - Menza4-kasa3:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - US 005 - m�� vjezd:
+  - L1:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - EXT/kola-B:
+  - STUD_UB113:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - Menza4-kasa3:
+  - Menza1-kasa-p:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - US 005 - z�vora vjezd:
+  - EP-BUFET:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - US 005 - m�� vjezd:
+  - Parkoviste-vyjezd:
       x: UNKNOWN!
       y: UNKNOWN!
 
diff --git a/python-module/DatasetConfigs/WIFI.yaml b/python-module/DatasetConfigs/WIFI.yaml
index 99928d7..8549dd2 100644
--- a/python-module/DatasetConfigs/WIFI.yaml
+++ b/python-module/DatasetConfigs/WIFI.yaml
@@ -8,111 +8,112 @@ regex: OD_ZCU_WIFI_[0-9][0-9]_[0-9][0-9][0-9][0-9]_CSV.zip
 update-period: 24
 # pozice jednotlivych zarizeni, ktera jsou v datasetu
 devices:
-  - eh-cat2960-sw.zcu.cz:
+
+  - uc-idf2a-cat4510-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ic-ui411-s1-cat3560-sw.zcu.cz:
+  - bk-a4-cat2960-sw.bk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-m20-s11-sw.mk.zcu.cz:
+  - bk-a1-s4-sw.bk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - cd-s6-cat2960-sw.zcu.cz:
+  - tc-s2-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ub-cat4506-sw.zcu.cz:
+  - mk-m20-s9-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ic-ui402-cat2960-sw.zcu.cz:
+  - mk-k-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ic-ui411-s2-cat3560-sw.zcu.cz:
+  - ls-s2-cat4506-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - uk-ops-cat2960-sw.zcu.cz:
+  - mk-m20-s8-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - tc-s3-cat2960-sw.zcu.cz:
+  - uk-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-m16-s5-sw.mk.zcu.cz:
+  - uk-rek-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - so-s1-cat2960-sw.zcu.cz:
+  - mk-m16-s3-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-m16-s1-sw.mk.zcu.cz:
+  - mk-m14-cat2960-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - tg-s2-cat3560-sw.zcu.cz:
+  - lk-l2-s6-sw.lk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - lk-l1-s1-sw.lk.zcu.cz:
+  - mk-m16-s4-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - uh-cat2960-sw.zcu.cz:
+  - ic-ui411-s1-cat3560-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - tf-cat4500-sw.zcu.cz:
+  - ul-s8-cat3560-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ls-z-cat2960c-sw.zcu.cz:
+  - mk-m20-s6-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-k-s2-sw.mk.zcu.cz:
+  - ep-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-m20-s7-sw.mk.zcu.cz:
+  - lk-l1-s7-sw.lk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ls-s2-cat4506-sw.zcu.cz:
+  - cd-s8-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - lk-l2-s2-sw.lk.zcu.cz:
+  - mk-k-s4-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - lk-l1-s7-sw.lk.zcu.cz:
+  - ec-s1-cat4506-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - eu-s1-cat2960-sw.zcu.cz:
+  - bk-a1-s3-sw.bk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-m16-s4-sw.mk.zcu.cz:
+  - uc-idf1a-cat4510-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ic-u1-cat2960-sw.zcu.cz:
+  - rj-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-b36-s11-sw.mk.zcu.cz:
+  - mk-m14-s1-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-b36-s9-sw.mk.zcu.cz:
+  - bk-a3-s6-cat2960-sw.bk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
@@ -120,727 +121,727 @@ devices:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ec-s2-cat4506-sw.zcu.cz:
+  - uv-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ek-s2-cat4506-sw.zcu.cz:
+  - cd-s1-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-b36-s1-sw.mk.zcu.cz:
+  - kl-idf1-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - cd-s4-cat2960-sw.zcu.cz:
+  - ut-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-m20-s4-sw.mk.zcu.cz:
+  - ps-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - lk-l1-s2-sw.lk.zcu.cz:
+  - lk-l2-s5-sw.lk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - rj-cat2960-sw.zcu.cz:
+  - ko-cat3560-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - pc-s1-cat4506-sw.zcu.cz:
+  - mk-m16-s5-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - cd-s7-cat2960-sw.zcu.cz:
+  - uc-kma-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ur-cat2960-sw.zcu.cz:
+  - th-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - vc-s3-idf-cat2960-sw.zcu.cz:
+  - uh-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-m20-s9-sw.mk.zcu.cz:
+  - el-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - uc-idf2a-cat4510-sw.zcu.cz:
+  - so-cat4506-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - el-cat2960-sw.zcu.cz:
+  - uk-kpv-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-m14-cat2960-sw.mk.zcu.cz:
+  - mk-b36-cat3560-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - cd-s9-cat3750-sw.zcu.cz:
+  - mk-m14-s2-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - eu-cat2960-sw.zcu.cz:
+  - bk-a3-s5-sw.bk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-b36-cat3560-sw.zcu.cz:
+  - uc-idf1b-cat4510-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - uk-s1-cat2960-sw.zcu.cz:
+  - tf-s3-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-m20-s10-sw.mk.zcu.cz:
+  - ic-n1-nx5548-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - un-idf4a-cat4510-sw.zcu.cz:
+  - vc-s3-idf-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - th-cat2960-sw.zcu.cz:
+  - ec-s2-cat4506-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ic-s1-cat4507-sw.zcu.cz:
+  - so-s2-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - lk-l1-s6-sw.lk.zcu.cz:
+  - lk-l1-s5-sw.lk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-b36-s5-sw.mk.zcu.cz:
+  - un-idf3a-cat4510-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - bk-a2-cat2960-sw.bk.zcu.cz:
+  - bk-a3-cat2960-sw.bk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - bk-a3-s1-sw.bk.zcu.cz:
+  - ul-s2-cat4506-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - kl-idf3-cat2960-sw.zcu.cz:
+  - mk-m16-cat3560-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - bk-a2-s1-sw.bk.zcu.cz:
+  - uk-kks-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ul-kks-s2-cat2960-sw.zcu.cz:
+  - mk-b36-s2-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - tc-s4-cat2960-sw.zcu.cz:
+  - sp-cat4506-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - uu-cat4506-sw.zcu.cz:
+  - cd-s5-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ic-2504-wlc:
+  - ic-u1-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - uk-kks-cat2960-sw.zcu.cz:
+  - ul-kks-s1-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - lk-l1-s4-sw.lk.zcu.cz:
+  - eu-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - vc-s2-cat2960-sw.zcu.cz:
+  - ic-2504-wlc:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - bk-a3-s6-cat2960-sw.bk.zcu.cz:
+  - mk-m20-s1-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - bk-a2-s2-sw.bk.zcu.cz:
+  - mk-b36-s1-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - kl-idf1-cat2960-sw.zcu.cz:
+  - bk-a1-s2-sw.bk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - cd-s1-cat2960-sw.zcu.cz:
+  - ul-s6-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - uk-rek-cat2960-sw.zcu.cz:
+  - lk-s3-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ul-s8-cat3560-sw.zcu.cz:
+  - mk-b36-s4-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-b36-s4-sw.mk.zcu.cz:
+  - rj-s1-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - kl-idf2-cat2960-sw.zcu.cz:
+  - kl-s2-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - bk-a1-s3-sw.bk.zcu.cz:
+  - mk-b36-s11-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - tc-s6-cat2960-sw.zcu.cz:
+  - mk-m20-s2-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ko-s1-cat2960-sw.zcu.cz:
+  - ek-s3-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - uf-cat2960-sw.zcu.cz:
+  - mk-k-s5-cat2960-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-k-s4-sw.mk.zcu.cz:
+  - ts-cat4900-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-k-s5-cat2960-sw.mk.zcu.cz:
+  - tg-s1-cat3560-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - cd-cat4500-sw.zcu.cz:
+  - ic-ui411-s2-cat3560-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ul-kks-s3-cat2960-sw.zcu.cz:
+  - us-z-cat2960c-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ul-tel-cat2960-sw.zcu.cz:
+  - th-s1-cat3750-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - bk-a2-s3-sw.bk.zcu.cz:
+  - rti-cat4506-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - uu-kks-cat2960-sw.zcu.cz:
+  - lk-l1-s4-sw.lk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ul-s-cat6506-sw.zcu.cz:
+  - mk-m16-s1-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - so-cat4506-sw.zcu.cz:
+  - nc-s1-cat3560-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-b36-s7-sw.mk.zcu.cz:
+  - lk-l1-cat2960-sw.lk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ul-s2-cat4506-sw.zcu.cz:
+  - ul-rti-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - cd-s8-cat2960-sw.zcu.cz:
+  - rj-s2-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-m20-s2-sw.mk.zcu.cz:
+  - ub-cat4506-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - uk-kto-cat2960-sw.zcu.cz:
+  - mk-b36-s8-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - tc-s5-cat2960-sw.zcu.cz:
+  - cd-s3-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - bk-a3-s2-sw.bk.zcu.cz:
+  - lk-l1-s6-sw.lk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ps-s2-cat2960-sw.zcu.cz:
+  - lk-l1-s3-sw.lk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-b36-s6-sw.mk.zcu.cz:
+  - ul-s-cat6506-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - el-z1-cat2960c-sw.zcu.cz:
+  - mk-m14-s4-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ep-cat2960-sw.zcu.cz:
+  - cd-s7-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-m14-s4-sw.mk.zcu.cz:
+  - hj-s1-cat4506-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - tf-s2-cat3560-sw.zcu.cz:
+  - uk-kto-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - so-s2-cat2960-sw.zcu.cz:
+  - kl-s1-cat4506-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - uk-cat2960-sw.zcu.cz:
+  - ul-kks-s3-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - tf-s3-cat2960-sw.zcu.cz:
+  - ic-ui411-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - lk-l2-s4-sw.lk.zcu.cz:
+  - cd-s2-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - bk-a3-s3-sw.bk.zcu.cz:
+  - pc-s1-cat4506-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - bk-cat3750-sw.zcu.cz:
+  - lk-l2-s2-sw.lk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - bk-a3-cat2960-sw.bk.zcu.cz:
+  - bk-a1-s1-sw.bk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ul-rti-cat2960-sw.zcu.cz:
+  - tg-s2-cat3560-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ul-s1-cat4506-sw.zcu.cz:
+  - ek-s2-cat4506-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - tf-s1-cat2960-sw.zcu.cz:
+  - mk-k-s2-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-m14-s1-sw.mk.zcu.cz:
+  - kl-idf3-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ko-cat3560-sw.zcu.cz:
+  - so-s1-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-k-s1-sw.mk.zcu.cz:
+  - el-z2-cat2960c-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - bk-a3-s5-sw.bk.zcu.cz:
+  - bk-a1-s5-sw.bk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-b36-s8-sw.mk.zcu.cz:
+  - tc-s1-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ul-kks-s1-cat2960-sw.zcu.cz:
+  - un-idf4a-cat4510-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - hj-s1-cat4506-sw.zcu.cz:
+  - ic-n2-nx5548-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-cat4900-sw.zcu.cz:
+  - el-z1-cat2960c-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - un-idf3b-cat4510-sw.zcu.cz:
+  - cd-cat4500-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - um-cat2960-sw.zcu.cz:
+  - kl-idf2-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - uc-idf1a-cat4510-sw.zcu.cz:
+  - tc-s5-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ic-5520-wlc:
+  - lk-l2-s4-sw.lk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - bk-a1-s5-sw.bk.zcu.cz:
+  - st-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - kl-s2-idf1-cat2960-sw.zcu.cz:
+  - ul-s1-cat4506-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ic-ui411-cat2960-sw.zcu.cz:
+  - ic-u5-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - cd-s3-cat2960-sw.zcu.cz:
+  - bk-a2-s3-sw.bk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ic-n2-nx5548-sw.zcu.cz:
+  - cd-s6-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ls-s1-cat4510-sw.zcu.cz:
+  - ic-ui121-cat3560-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - uk-kpv-cat2960-sw.zcu.cz:
+  - bk-a3-s2-sw.bk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ls-s3-cat2960-sw.zcu.cz:
+  - ic-ui402-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - tc-s1-cat2960-sw.zcu.cz:
+  - mk-b36-s10-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - us-z-cat2960c-sw.zcu.cz:
+  - ls-s1-cat4510-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ps-cat2960-sw.zcu.cz:
+  - mk-b36-s9-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - bk-a1-s1-sw.bk.zcu.cz:
+  - mk-m20-s4-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - lk-l1-s3-sw.lk.zcu.cz:
+  - uu-kks-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - vc-s1-idf-cat2960-sw.zcu.cz:
+  - ek-s1-cat4506-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-m14-s2-sw.mk.zcu.cz:
+  - mk-m14-s3-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - tg-s1-cat3560-sw.zcu.cz:
+  - cd-s9-cat3750-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-b36-s3-sw.mk.zcu.cz:
+  - bk-a3-s1-sw.bk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - jj-s3-cat2960-sw.zcu.cz:
+  - mk-m20-s11-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - lk-l1-s5-sw.lk.zcu.cz:
+  - um-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ul-s3-cat2960-sw.zcu.cz:
+  - uu-cat4506-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - rs-cat2960-sw.zcu.cz:
+  - mk-m20-s12-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ul-s6-cat2960-sw.zcu.cz:
+  - bk-a3-s3-sw.bk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-b36-s10-sw.mk.zcu.cz:
+  - ul-tel2-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ek-s1-cat4506-sw.zcu.cz:
+  - ls-s3-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ul-s4-cat2960-sw.zcu.cz:
+  - eu-s1-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - st-cat2960-sw.zcu.cz:
+  - lk-l2-s3-sw.lk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - bk-a1-s2-sw.bk.zcu.cz:
+  - tf-s2-cat3560-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - uc-idf2b-cat4510-sw.zcu.cz:
+  - ls-z-cat2960c-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-m20-s6-sw.mk.zcu.cz:
+  - tg-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - uv-cat2960-sw.zcu.cz:
+  - uk-s1-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ic-5508-wlc:
+  - ic-5520-wlc:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - jj-s1-cat2960-sw.zcu.cz:
+  - bk-a2-cat2960-sw.bk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - tg-cat2960-sw.zcu.cz:
+  - ic-ui403-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - lk-l2-s1-sw.lk.zcu.cz:
+  - vc-s2-idf-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - nc-s1-cat3560-sw.zcu.cz:
+  - jj-s1-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ul-tel2-cat2960-sw.zcu.cz:
+  - ic-4404-wlc:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ic-n1-nx5548-sw.zcu.cz:
+  - tf-s1-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - bk-a1-s4-sw.bk.zcu.cz:
+  - rs-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - th-s1-cat3750-sw.zcu.cz:
+  - bk-a3-s4-sw.bk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - lk-l2-s5-sw.lk.zcu.cz:
+  - tc-s6-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-m20-s8-sw.mk.zcu.cz:
+  - mk-m20-s3-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-m20-s1-sw.mk.zcu.cz:
+  - bk-cat3750-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - kl-s1-cat4506-sw.zcu.cz:
+  - lk-l2-s1-sw.lk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - lk-l1-s8-sw.lk.zcu.cz:
+  - lk-l1-s2-sw.lk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ts-cat4900-sw.zcu.cz:
+  - bk-a2-s1-sw.bk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - vc-s2-idf-cat2960-sw.zcu.cz:
+  - ps-s2-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - tc-s2-cat2960-sw.zcu.cz:
+  - ul-tel-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-b36-s2-sw.mk.zcu.cz:
+  - ic-u3-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ic-ui403-cat2960-sw.zcu.cz:
+  - mk-cat4900-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-m20-s5-sw.mk.zcu.cz:
+  - un-idf3b-cat4510-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - bk-a4-cat2960-sw.bk.zcu.cz:
+  - mk-k-s1-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - uc-idf1b-cat4510-sw.zcu.cz:
+  - jj-s3-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - lk-l1-cat2960-sw.lk.zcu.cz:
+  - tc-s3-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - un-idf4b-cat4510-sw.zcu.cz:
+  - vc-s2-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - el-z2-cat2960c-sw.zcu.cz:
+  - tf-cat4500-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - rj-s2-cat2960-sw.zcu.cz:
+  - mk-b36-s5-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - kl-s2-cat2960-sw.zcu.cz:
+  - ul-s3-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-m16-cat3560-sw.mk.zcu.cz:
+  - mk-m20-s5-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ic-ui121-cat3560-sw.zcu.cz:
+  - eh-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ic-u3-cat2960-sw.zcu.cz:
+  - lk-l2-s7-sw.lk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - sp-cat4506-sw.zcu.cz:
+  - ic-5508-wlc:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - bk-a2-s5-cat2960-sw.bk.zcu.cz:
+  - ic-s1-cat4507-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - rj-s1-cat2960-sw.zcu.cz:
+  - tc-s4-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-k-s3-sw.mk.zcu.cz:
+  - mk-m16-s2-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - bk-a1-s6-cat2960-sw.bk.zcu.cz:
+  - uk-ops-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - cd-s5-cat2960-sw.zcu.cz:
+  - kl-s2-idf1-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - uc-kma-cat2960-sw.zcu.cz:
+  - ul-kks-s2-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - lk-s3-cat2960-sw.zcu.cz:
+  - mk-m20-s7-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-m16-s2-sw.mk.zcu.cz:
+  - ur-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - cd-s2-cat2960-sw.zcu.cz:
+  - lk-l1-s8-sw.lk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-m20-s12-sw.mk.zcu.cz:
+  - mk-k-s3-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - un-idf3a-cat4510-sw.zcu.cz:
+  - bk-a2-s5-cat2960-sw.bk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - vc-s3-cat2960-sw.zcu.cz:
+  - mk-b36-s7-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - lk-s1-cat2960-sw.zcu.cz:
+  - vc-s3-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ic-4404-wlc:
+  - vc-s1-idf-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-m14-s3-sw.mk.zcu.cz:
+  - ul-s4-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - lk-l2-s3-sw.lk.zcu.cz:
+  - uf-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-m20-s3-sw.mk.zcu.cz:
+  - bk-a2-s2-sw.bk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ek-s3-cat2960-sw.zcu.cz:
+  - mk-b36-s6-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ut-cat2960-sw.zcu.cz:
+  - lk-l1-s1-sw.lk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-k-cat2960-sw.zcu.cz:
+  - uc-idf2b-cat4510-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - mk-m16-s3-sw.mk.zcu.cz:
+  - bk-a1-s6-cat2960-sw.bk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - lk-l2-s6-sw.lk.zcu.cz:
+  - mk-b36-s3-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ec-s1-cat4506-sw.zcu.cz:
+  - lk-s1-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - rti-cat4506-sw.zcu.cz:
+  - us-idf5-cat4506-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - us-idf5-cat4506-sw.zcu.cz:
+  - cd-s4-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - ic-u5-cat2960-sw.zcu.cz:
+  - mk-m20-s10-sw.mk.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - bk-a3-s4-sw.bk.zcu.cz:
+  - ko-s1-cat2960-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
-  - lk-l2-s7-sw.lk.zcu.cz:
+  - un-idf4b-cat4510-sw.zcu.cz:
       x: UNKNOWN!
       y: UNKNOWN!
 
diff --git a/python-module/DatasetCrawler/JISCrawler.py b/python-module/DatasetCrawler/JISCrawler.py
index 7f42f6a..25e6b0b 100644
--- a/python-module/DatasetCrawler/JISCrawler.py
+++ b/python-module/DatasetCrawler/JISCrawler.py
@@ -1,5 +1,5 @@
 from Utilities import FolderProcessor
-from Utilities.Crawler import BasicCrawler
+from Utilities.Crawler import BasicCrawlerFunctions
 
 # Path to crawled data
 CRAWLED_DATA_PATH = "CrawledData/"
@@ -20,22 +20,22 @@ def crawl(config):
     regex = config['regex']
     path_for_files = CRAWLED_DATA_PATH + dataset_name + '/'
 
-    first_level_links = BasicCrawler.get_all_links(url)
-    filtered_first_level_links = BasicCrawler.filter_links(first_level_links, "^OD_ZCU")
-    absolute_first_level_links = BasicCrawler.create_absolute_links(filtered_first_level_links, url)
+    first_level_links = BasicCrawlerFunctions.get_all_links(url)
+    filtered_first_level_links = BasicCrawlerFunctions.filter_links(first_level_links, "^OD_ZCU")
+    absolute_first_level_links = BasicCrawlerFunctions.create_absolute_links(filtered_first_level_links, url)
 
     files = []
 
     for link in absolute_first_level_links:
-        second_level_links = BasicCrawler.get_all_links(link)
-        filtered_second_level_links = BasicCrawler.filter_links(second_level_links, regex)
-        absolute_second_level_links = BasicCrawler.create_absolute_links(filtered_second_level_links, link)
-        final_links = BasicCrawler.remove_downloaded_links(absolute_second_level_links, dataset_name)
+        second_level_links = BasicCrawlerFunctions.get_all_links(link)
+        filtered_second_level_links = BasicCrawlerFunctions.filter_links(second_level_links, regex)
+        absolute_second_level_links = BasicCrawlerFunctions.create_absolute_links(filtered_second_level_links, link)
+        final_links = BasicCrawlerFunctions.remove_downloaded_links(absolute_second_level_links, dataset_name)
 
         for file_link in final_links:
             files.append(file_link)
 
     for file in files:
-        BasicCrawler.download_file_from_url(file, path_for_files, dataset_name)
+        BasicCrawlerFunctions.download_file_from_url(file, path_for_files, dataset_name)
 
     FolderProcessor.unzip_all_csv_zip_files_in_folder(path_for_files)
diff --git a/python-module/DatasetCrawler/KOLOBEZKYCrawler.py b/python-module/DatasetCrawler/KOLOBEZKYCrawler.py
index 0a9dd80..fe29563 100644
--- a/python-module/DatasetCrawler/KOLOBEZKYCrawler.py
+++ b/python-module/DatasetCrawler/KOLOBEZKYCrawler.py
@@ -1,5 +1,5 @@
 from Utilities import FolderProcessor
-from Utilities.Crawler import BasicCrawler
+from Utilities.Crawler import BasicCrawlerFunctions
 
 # Path to crawled data
 CRAWLED_DATA_PATH = "CrawledData/"
@@ -20,22 +20,22 @@ def crawl(config):
     regex = config['regex']
     path_for_files = CRAWLED_DATA_PATH + dataset_name + '/'
 
-    first_level_links = BasicCrawler.get_all_links(url)
-    filtered_first_level_links = BasicCrawler.filter_links(first_level_links, "^OD_ZCU")
-    absolute_first_level_links = BasicCrawler.create_absolute_links(filtered_first_level_links, url)
+    first_level_links = BasicCrawlerFunctions.get_all_links(url)
+    filtered_first_level_links = BasicCrawlerFunctions.filter_links(first_level_links, "^OD_ZCU")
+    absolute_first_level_links = BasicCrawlerFunctions.create_absolute_links(filtered_first_level_links, url)
 
     files = []
 
     for link in absolute_first_level_links:
-        second_level_links = BasicCrawler.get_all_links(link)
-        filtered_second_level_links = BasicCrawler.filter_links(second_level_links, regex)
-        absolute_second_level_links = BasicCrawler.create_absolute_links(filtered_second_level_links, link)
-        final_links = BasicCrawler.remove_downloaded_links(absolute_second_level_links, dataset_name)
+        second_level_links = BasicCrawlerFunctions.get_all_links(link)
+        filtered_second_level_links = BasicCrawlerFunctions.filter_links(second_level_links, regex)
+        absolute_second_level_links = BasicCrawlerFunctions.create_absolute_links(filtered_second_level_links, link)
+        final_links = BasicCrawlerFunctions.remove_downloaded_links(absolute_second_level_links, dataset_name)
 
         for file_link in final_links:
             files.append(file_link)
 
     for file in files:
-        BasicCrawler.download_file_from_url(file, "CrawledData/" + dataset_name + "/", dataset_name)
+        BasicCrawlerFunctions.download_file_from_url(file, CRAWLED_DATA_PATH + dataset_name + "/", dataset_name)
 
-    FolderProcessor.unzip_all_csv_zip_files_in_folder("CrawledData/" + dataset_name + "/")
+    FolderProcessor.unzip_all_csv_zip_files_in_folder(CRAWLED_DATA_PATH + dataset_name + "/")
diff --git a/python-module/DatasetCrawler/WIFICrawler.py b/python-module/DatasetCrawler/WIFICrawler.py
index 7f42f6a..25e6b0b 100644
--- a/python-module/DatasetCrawler/WIFICrawler.py
+++ b/python-module/DatasetCrawler/WIFICrawler.py
@@ -1,5 +1,5 @@
 from Utilities import FolderProcessor
-from Utilities.Crawler import BasicCrawler
+from Utilities.Crawler import BasicCrawlerFunctions
 
 # Path to crawled data
 CRAWLED_DATA_PATH = "CrawledData/"
@@ -20,22 +20,22 @@ def crawl(config):
     regex = config['regex']
     path_for_files = CRAWLED_DATA_PATH + dataset_name + '/'
 
-    first_level_links = BasicCrawler.get_all_links(url)
-    filtered_first_level_links = BasicCrawler.filter_links(first_level_links, "^OD_ZCU")
-    absolute_first_level_links = BasicCrawler.create_absolute_links(filtered_first_level_links, url)
+    first_level_links = BasicCrawlerFunctions.get_all_links(url)
+    filtered_first_level_links = BasicCrawlerFunctions.filter_links(first_level_links, "^OD_ZCU")
+    absolute_first_level_links = BasicCrawlerFunctions.create_absolute_links(filtered_first_level_links, url)
 
     files = []
 
     for link in absolute_first_level_links:
-        second_level_links = BasicCrawler.get_all_links(link)
-        filtered_second_level_links = BasicCrawler.filter_links(second_level_links, regex)
-        absolute_second_level_links = BasicCrawler.create_absolute_links(filtered_second_level_links, link)
-        final_links = BasicCrawler.remove_downloaded_links(absolute_second_level_links, dataset_name)
+        second_level_links = BasicCrawlerFunctions.get_all_links(link)
+        filtered_second_level_links = BasicCrawlerFunctions.filter_links(second_level_links, regex)
+        absolute_second_level_links = BasicCrawlerFunctions.create_absolute_links(filtered_second_level_links, link)
+        final_links = BasicCrawlerFunctions.remove_downloaded_links(absolute_second_level_links, dataset_name)
 
         for file_link in final_links:
             files.append(file_link)
 
     for file in files:
-        BasicCrawler.download_file_from_url(file, path_for_files, dataset_name)
+        BasicCrawlerFunctions.download_file_from_url(file, path_for_files, dataset_name)
 
     FolderProcessor.unzip_all_csv_zip_files_in_folder(path_for_files)
diff --git a/python-module/Pipeline.py b/python-module/Pipeline.py
index f4bf5ff..09d818d 100644
--- a/python-module/Pipeline.py
+++ b/python-module/Pipeline.py
@@ -66,7 +66,7 @@ def validate_process_data(config):
     unknown_devices_size = len(unknown_devices_set)
 
     if unknown_devices_size != 0:
-        print("There is " + str(unknown_devices_size) + " unknown devies")
+        print("There is " + str(unknown_devices_size) + " unknown devices")
         ConfigureFunctions.update_configuration(config["dataset-name"], unknown_devices_set)
         return False
 
diff --git a/python-module/Utilities/CSV/CSVutils.py b/python-module/Utilities/CSV/CSVutils.py
index b4dad02..c68e2f6 100644
--- a/python-module/Utilities/CSV/CSVutils.py
+++ b/python-module/Utilities/CSV/CSVutils.py
@@ -4,32 +4,35 @@ PROCESSED_DATA_PATH = "ProcessedData/"
 
 def get_unique_names_from_file(filename, column_number):
     """
-
+        Extract set of unique names from file
     Args:
-        filename:
-        column_number:
+        filename: path to processed file
+        column_number: unique names are expected in csv file on column_number
 
     Returns:
-
+        set of unique names
     """
-    f = open(filename, "r")
-
     # create set of unique names
     name_set = set()
 
-    # go through every line of line
-    for x in f:
-        # split by csv splitter ;
-        array = x.split(";")
-        # add string from chosen column to set
-        name_set.add(array[column_number])
-
-    f.close()
+    with open(filename, "r") as file:
+        # go through every line of line
+        for x in file:
+            # split by csv splitter ;
+            array = x.split(";")
+            # add string from chosen column to set
+            name_set.add(array[column_number])
 
     return name_set
 
 
 def export_data_to_csv(filename, data_dict):
+    """
+        Takes data_dict and export it into a csv file
+    Args:
+        filename: name of exported file
+        data_dict: dictionary containing data from DatasetProcessor
+    """
     with open(PROCESSED_DATA_PATH + filename[12:], "w+") as file:
 
         for date in data_dict:
diff --git a/python-module/Utilities/FolderProcessor.py b/python-module/Utilities/FolderProcessor.py
index 6278e76..7e57d17 100644
--- a/python-module/Utilities/FolderProcessor.py
+++ b/python-module/Utilities/FolderProcessor.py
@@ -1,6 +1,6 @@
 import os
 import zipfile
-from CSV import CSVutils
+from Utilities.CSV import CSVutils
 
 
 def list_of_all_files(path):
@@ -67,7 +67,7 @@ def get_devices_set(path):
     unique_names = set()
 
     for file_path in files_in_dir:
-        unique_names.add(CSVutils.get_unique_names_from_file(path+file_path, 0))
+        unique_names.update(CSVutils.get_unique_names_from_file(path+file_path, 0))
 
     return unique_names
 
