diff --git a/app.py b/app.py
index 4af6dd2d..7d76c657 100644
--- a/app.py
+++ b/app.py
@@ -10,7 +10,7 @@
     query_params,
     load_uf_pop_data,
     load_uf_covid_data,
-    query_ufs
+    query_uf_city
 )
 import matplotlib.pyplot as plt
 
@@ -56,28 +56,29 @@ def _run_SEIR_BAYES_model(N, E0, I0, R0,
     st.sidebar.title('Seleção de parâmetros')
     st.sidebar.markdown('Para simular outros cenários, altere um parâmetro e tecle **Enter**. O novo resultado será calculado e apresentado automaticamente.')
     
-    st.sidebar.markdown('#### Parâmetros de UF') 
+    st.sidebar.markdown('#### Parâmetros de UF/Município')
 
-    UF = st.sidebar.selectbox('Estado',
-                              options=query_ufs(),
-                              index=0)
+    GRANULARITY = st.sidebar.selectbox('Unidade',
+                                       options=['Estado', 'Município'],
+                                       index=1) 
 
-    dates, dt_index = query_dates(UF)
 
-    use_capital = st.sidebar.checkbox('Usar população da capital', value=True)
+    uf_city_list, uf_city_list_index = query_uf_city(GRANULARITY)
+    UF_CITY = st.sidebar.selectbox(f'{GRANULARITY}',
+                              options=uf_city_list,
+                              index=uf_city_list_index)
+
+    dates, dt_index = query_dates(UF_CITY, GRANULARITY)
+
 
     DT = st.sidebar.selectbox('Data',
                               options=dates,
                               index=dt_index)
 
-    if UF == '(Selecione)':
-        _N = 13_000_000
-        _E0 = 50
-        _I0 = 152
-        _R0 = 1 
-    else:
-        _N, _E0, _I0, _R0 = query_params(UF, DT, use_capital)
+
+    _N, _E0, _I0, _R0 = query_params(UF_CITY, DT, GRANULARITY)
   
+
     st.sidebar.markdown('#### Condições iniciais')
 
     N = st.sidebar.number_input('População total (N)',
@@ -164,11 +165,13 @@ def _run_SEIR_BAYES_model(N, E0, I0, R0,
     st.markdown('''
         >### Configurações da  simulação (menu à esquerda)
         >
-        >#### Seleção de UF
-        >É possível selecionar uma unidade da federação para utilizar seus parâmetros nas condições inicias de *População total* (N), *Indivíduos infecciosos inicialmente* (I0) e *Indivíduos removidos com imunidade inicialmente* (R0).
+        >### Seleção de Unidade
+        É possível selecionar o tipo de unidade (Estado ou Município).
+        >#### Seleção de UF/Município
+        >Baseado na seleção anterior, é possível selecionar uma unidade da federação ou município para utilizar seus parâmetros nas condições inicias de *População total* (N), *Indivíduos infecciosos inicialmente* (I0), *Indivíduos removidos com imunidade inicialmente* (R0) e *Indivíduos expostos inicialmente (E0)*.
         >
         >#### Limites inferiores e superiores dos parâmetros
         >Também podem ser ajustados limites superior e inferior dos parâmetros *Período infeccioso*, *Tempo de incubação* e *Número básico de reprodução*. Estes limites definem um intervalo de confiança de 95% de uma distribuição log-normal para cada parâmetro.\n\n\n
         ''')
     st.markdown('---')
-    st.markdown('###### Os dados dos casos confirmados foram coletados na [Plataforma IVIS](http://plataforma.saude.gov.br/novocoronavirus/#COVID-19-brazil) e os populacionais, obtidos do IBGE (endereço: ftp://ftp.ibge.gov.br/Estimativas_de_Populacao/Estimativas_2019/estimativa_dou_2019.xls)')
+    st.markdown('###### Os dados dos casos confirmados foram coletados em [Número de casos confirmados de COVID-19 no Brasil](https://raw.githubusercontent.com/wcota/covid19br/master/cases-brazil-cities-time.csv) e os populacionais, obtidos do IBGE (endereço: ftp://ftp.ibge.gov.br/Estimativas_de_Populacao/Estimativas_2019/estimativa_dou_2019.xls)')
diff --git a/data/collectors.py b/data/collectors.py
index eee891af..9001abb8 100644
--- a/data/collectors.py
+++ b/data/collectors.py
@@ -3,121 +3,33 @@
 import requests
 
 
-def load_uf_codes():
-    return (
-        pd.read_html(
-            'https://www.oobj.com.br/bc/article/'
-            'quais-os-c%C3%B3digos-de-cada-uf-no-brasil-465.html'
-        )
-        [0]
-        .set_index('Código UF')
-        ['UF']
-    )
-
-
-def load_ms_db():
-    return (
-        json.loads(
-            requests
-            .get(
-                'http://plataforma.saude.gov.br'
-                '/novocoronavirus/resources/scripts/database.js'
+def load_dump_covid_19_data():
+
+    COVID_19_BY_CITY_URL='https://raw.githubusercontent.com/wcota/covid19br/master/cases-brazil-cities-time.csv'
+
+    by_city=(pd.read_csv(COVID_19_BY_CITY_URL)
+               .query('country == "Brazil"')
+               .drop(columns=['country'])
+               .pipe(lambda df: df[df.state!='TOTAL'])
+               .assign(city=lambda df: df.city.apply(lambda x: x.split('/')[0]))
+               .rename(columns={'totalCases': 'cases',
+                                'newCases': 'new_cases',
+                                'state': 'uf'})
+               .sort_values(by=['city', 'date'])
             )
-            .text
-            .replace('\n', '')
-            .replace('var database=', '')
-        )
-        ['brazil']
-    )
-
 
-def ms_db_to_df(db):
-    rows = []
-    for d in db:
-        for v in d['values']:
-            rows.append(
-                [
-                    d['date'],
-                    v['uid'],
-                    v.get('suspects', 0),
-                    v.get('refuses', 0),
-                    v.get('cases', 0),
-                    v.get('deaths', 0)
-                ]
-            )
-    df = (
-        pd.DataFrame(
-            rows,
-            columns=[
-                'date', 'uid', 'suspects',
-                'refuses', 'cases', 'deaths'
-            ]
-        )
-        .assign(
-            date=lambda x: pd.to_datetime(
-                x['date'],
-                format='%d/%m/%Y'
-            )
-        )
-    )
-    return (
-        pd.merge(
-            df,
-            load_uf_codes(),
-            how='left',
-            left_on='uid',
-            right_index=True
-        )
-        .drop(['uid'], axis=1)
-    )
-
-
-def load_ms_data():
-    db = load_ms_db()
-    df = ms_db_to_df(db)
-    return df
-
-
-def dump_by_uf(df):
-    ufs = (
-        df['UF']
-        .dropna()
-        .unique()
-    )
-
-    for uf in ufs:
-        print(f'Saving data for UF {uf}')
-        (
-            df
-            [df['UF'] == uf]
-            .sort_values(by='date')
-            .drop(['UF'], axis=1)
-            .to_csv(
-                f'data/csv/by_uf/{uf}.csv',
-                index=False
-            )
-        )
-
-
-def dump_by_day(df):
-    days = (
-        df['date']
-        .dropna()
-        .dt.strftime(date_format='%d-%m-%Y')
-        .unique()
-    )
-    for day in days:
-        print(f'Saving data for day {day}')
-        (
-            df
-            [df['date'].dt.strftime(date_format='%d-%m-%Y') == day]
-            .sort_values(by='UF')
-            .drop(['date'], axis=1)
-            .to_csv(
-                f'data/csv/by_day/{day}.csv',
-                index=False
-            )
-        )
+    by_uf = (by_city
+             .groupby(['date', 'uf'])
+             ['new_cases', 'cases']
+             .sum()
+             .reset_index())
+    
+    dfs = [by_uf, by_city]
+    filenames = ['by_uf', 'by_city']
+    for df, filename in zip(dfs, filenames):
+        output_path = f'data/csv/covid_19/{filename}/{filename}.csv'
+        df.to_csv(output_path, index=False)
+        print(f'{filename} data exported to {output_path}')
 
 
 def load_dump_uf_pop():
@@ -132,7 +44,8 @@ def _load_uf_codes():
             )
             [0]
             .replace('\s\(\*\)', '', regex=True)
-            [['Unidade da Federação', 'UF']]
+            .rename(columns={'UF': 'uf'})
+            [['Unidade da Federação', 'uf']]
         )
 
     def _load_uf_capitals():
@@ -142,8 +55,8 @@ def _load_uf_capitals():
                 'https://www.estadosecapitaisdobrasil.com/'
             )
             [0]
-            .rename(columns={'Sigla': 'UF', 'Capital': 'city_name'})
-            [['UF', 'city_name']]
+            .rename(columns={'Sigla': 'uf', 'Capital': 'city'})
+            [['uf', 'city']]
         )
 
     # TODO: download excel file only once
@@ -157,7 +70,7 @@ def _load_city_pop():
             .rename(columns={
                 'COD. UF': 'UF_code',
                 'COD. MUNIC': 'city_code',
-                'NOME DO MUNICÍPIO': 'city_name',
+                'NOME DO MUNICÍPIO': 'city',
                 'POPULAÇÃO ESTIMADA': 'estimated_population'
             })
             .dropna(how='any')
@@ -169,7 +82,8 @@ def _load_city_pop():
             )
             .assign(  UF_code=lambda df: df.UF_code.astype(int))
             .assign(city_code=lambda df: df.city_code.astype(int))
-            [['UF', 'city_name', 'estimated_population']]
+            .rename(columns={'UF': 'uf'})
+            [['uf', 'city', 'estimated_population']]
         )
     
     def _load_uf_pop():
@@ -191,27 +105,27 @@ def _load_uf_pop():
                                     left_on='BRASIL E UNIDADES DA FEDERAÇÃO',
                                     right_on='Unidade da Federação',
                                     how='inner'))
-            [['UF', 'estimated_population']]
+            [['uf', 'estimated_population']]
         )
         
     uf_pop, city_pop, uf_capitals = (_load_uf_pop(),
                                      _load_city_pop(),
                                      _load_uf_capitals())
 
-    print('Combining UF and city data')
+    print('Combining uf and city data')
     uf_pop = (
         uf_pop
         # Add capital city name
         .merge(
             uf_capitals, 
             how='left', 
-            on='UF'
+            on='uf'
         )
         # Add capital population
         .merge(
             city_pop,
             how='left',
-            on=['UF', 'city_name']
+            on=['uf', 'city']
         )
         .rename(
             columns={
@@ -222,9 +136,9 @@ def _load_uf_pop():
     )
 
     dfs = [uf_pop, city_pop]
-    filenames = ['uf_population', 'city_population']
+    filenames = ['by_uf', 'by_city']
     for df, filename in zip(dfs, filenames):
-        output_path = f'data/csv/{filename}/{filename}.csv'
+        output_path = f'data/csv/population/{filename}/{filename}.csv'
         df.to_csv(output_path, index=False)
         print(f'{filename} data exported to {output_path}')
 
@@ -290,12 +204,10 @@ def load_jh_data():
     )
 
 if __name__ == '__main__':
-    try:
-        df = load_ms_data()
-        dump_by_uf(df)
-        dump_by_day(df)
-    except Exception as e:
-        print(f'Error when collecting COVID-19 cases data: {repr(e)}')
+    # try:
+    #     load_dump_covid_19_data()
+    # except Exception as e:
+    #     print(f'Error when collecting COVID-19 cases data: {repr(e)}')
     
     try:
         load_dump_uf_pop()
diff --git a/data/csv/by_day/01-02-2020.csv b/data/csv/by_day/01-02-2020.csv
deleted file mode 100644
index 9247a206..00000000
--- a/data/csv/by_day/01-02-2020.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-suspects,refuses,cases,deaths,UF
-1,0,0,0,CE
-0,1,0,0,MG
-1,1,0,0,PR
-0,1,0,0,RJ
-4,3,0,0,RS
-2,2,0,0,SC
-8,2,0,0,SP
diff --git a/data/csv/by_day/01-03-2020.csv b/data/csv/by_day/01-03-2020.csv
deleted file mode 100644
index 65dfbb7b..00000000
--- a/data/csv/by_day/01-03-2020.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-suspects,refuses,cases,deaths,UF
-1,0,0,0,AL
-9,4,0,0,BA
-6,2,0,0,CE
-5,1,0,0,DF
-2,1,0,0,ES
-5,0,0,0,GO
-17,3,0,0,MG
-2,0,0,0,MS
-1,1,0,0,PB
-5,2,0,0,PE
-5,3,0,0,PR
-19,8,0,0,RJ
-3,2,0,0,RN
-27,10,0,0,RS
-9,4,0,0,SC
-136,48,2,0,SP
diff --git a/data/csv/by_day/02-02-2020.csv b/data/csv/by_day/02-02-2020.csv
deleted file mode 100644
index 9247a206..00000000
--- a/data/csv/by_day/02-02-2020.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-suspects,refuses,cases,deaths,UF
-1,0,0,0,CE
-0,1,0,0,MG
-1,1,0,0,PR
-0,1,0,0,RJ
-4,3,0,0,RS
-2,2,0,0,SC
-8,2,0,0,SP
diff --git a/data/csv/by_day/02-03-2020.csv b/data/csv/by_day/02-03-2020.csv
deleted file mode 100644
index 6142febf..00000000
--- a/data/csv/by_day/02-03-2020.csv
+++ /dev/null
@@ -1,24 +0,0 @@
-suspects,refuses,cases,deaths,UF
-3,1,0,0,AL
-1,1,0,0,AM
-9,14,0,0,BA
-6,6,0,0,CE
-12,3,0,0,DF
-5,6,0,0,ES
-3,7,0,0,GO
-1,1,0,0,MA
-48,4,0,0,MG
-6,1,0,0,MS
-5,0,0,0,MT
-2,2,0,0,PA
-2,1,0,0,PB
-4,10,0,0,PE
-1,2,0,0,PI
-7,8,0,0,PR
-42,27,0,0,RJ
-2,6,0,0,RN
-1,0,0,0,RO
-73,10,0,0,RS
-36,4,0,0,SC
-1,0,0,0,SE
-163,48,2,0,SP
diff --git a/data/csv/by_day/03-02-2020.csv b/data/csv/by_day/03-02-2020.csv
deleted file mode 100644
index 2143247e..00000000
--- a/data/csv/by_day/03-02-2020.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,1,0,0,CE
-0,1,0,0,MG
-0,2,0,0,PR
-1,1,0,0,RJ
-4,3,0,0,RS
-2,2,0,0,SC
-7,3,0,0,SP
diff --git a/data/csv/by_day/03-03-2020.csv b/data/csv/by_day/03-03-2020.csv
deleted file mode 100644
index 92ccd4e2..00000000
--- a/data/csv/by_day/03-03-2020.csv
+++ /dev/null
@@ -1,24 +0,0 @@
-suspects,refuses,cases,deaths,UF
-5,1,0,0,AL
-3,1,0,0,AM
-21,16,0,0,BA
-19,9,0,0,CE
-12,3,0,0,DF
-5,6,0,0,ES
-7,7,0,0,GO
-1,1,0,0,MA
-58,6,0,0,MG
-6,1,0,0,MS
-6,0,0,0,MT
-1,4,0,0,PA
-4,1,0,0,PB
-4,11,0,0,PE
-1,2,0,0,PI
-14,8,0,0,PR
-62,29,0,0,RJ
-2,6,0,0,RN
-1,0,0,0,RO
-82,20,0,0,RS
-43,4,0,0,SC
-1,0,0,0,SE
-130,104,2,0,SP
diff --git a/data/csv/by_day/04-02-2020.csv b/data/csv/by_day/04-02-2020.csv
deleted file mode 100644
index af100b9a..00000000
--- a/data/csv/by_day/04-02-2020.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,1,0,0,CE
-0,1,0,0,MG
-0,2,0,0,PR
-1,2,0,0,RJ
-4,3,0,0,RS
-2,2,0,0,SC
-6,5,0,0,SP
diff --git a/data/csv/by_day/04-03-2020.csv b/data/csv/by_day/04-03-2020.csv
deleted file mode 100644
index 47006ded..00000000
--- a/data/csv/by_day/04-03-2020.csv
+++ /dev/null
@@ -1,24 +0,0 @@
-suspects,refuses,cases,deaths,UF
-5,1,0,0,AL
-4,1,0,0,AM
-19,21,0,0,BA
-14,18,0,0,CE
-18,5,0,0,DF
-5,7,0,0,ES
-1,12,0,0,GO
-0,2,0,0,MA
-82,6,0,0,MG
-10,3,0,0,MS
-6,0,0,0,MT
-1,4,0,0,PA
-4,1,0,0,PB
-6,11,0,0,PE
-1,2,0,0,PI
-13,8,0,0,PR
-55,52,0,0,RJ
-5,6,0,0,RN
-1,0,0,0,RO
-98,20,0,0,RS
-46,4,0,0,SC
-1,0,0,0,SE
-135,131,3,0,SP
diff --git a/data/csv/by_day/05-02-2020.csv b/data/csv/by_day/05-02-2020.csv
deleted file mode 100644
index da3bfa25..00000000
--- a/data/csv/by_day/05-02-2020.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,1,0,0,CE
-0,1,0,0,MG
-0,2,0,0,PR
-1,2,0,0,RJ
-5,3,0,0,RS
-1,3,0,0,SC
-4,9,0,0,SP
diff --git a/data/csv/by_day/05-03-2020.csv b/data/csv/by_day/05-03-2020.csv
deleted file mode 100644
index 00811c46..00000000
--- a/data/csv/by_day/05-03-2020.csv
+++ /dev/null
@@ -1,24 +0,0 @@
-suspects,refuses,cases,deaths,UF
-6,1,0,0,AL
-5,1,0,0,AM
-23,29,0,0,BA
-16,18,0,0,CE
-20,9,0,0,DF
-5,8,0,0,ES
-4,12,0,0,GO
-0,2,0,0,MA
-80,12,0,0,MG
-11,3,0,0,MS
-6,0,0,0,MT
-1,5,0,0,PA
-4,1,0,0,PB
-8,12,0,0,PE
-1,2,0,0,PI
-20,9,0,0,PR
-79,58,1,0,RJ
-4,8,0,0,RN
-1,0,0,0,RO
-104,25,0,0,RS
-54,4,0,0,SC
-2,0,0,0,SE
-182,159,6,0,SP
diff --git a/data/csv/by_day/06-02-2020.csv b/data/csv/by_day/06-02-2020.csv
deleted file mode 100644
index f03a51e3..00000000
--- a/data/csv/by_day/06-02-2020.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,1,0,0,CE
-0,1,0,0,CE
-1,1,0,0,MG
-1,1,0,0,MG
-0,2,0,0,PR
-0,2,0,0,PR
-1,2,0,0,RJ
-1,2,0,0,RJ
-3,5,0,0,RS
-3,5,0,0,RS
-1,3,0,0,SC
-1,3,0,0,SC
-3,10,0,0,SP
-3,10,0,0,SP
diff --git a/data/csv/by_day/06-03-2020.csv b/data/csv/by_day/06-03-2020.csv
deleted file mode 100644
index fdaab487..00000000
--- a/data/csv/by_day/06-03-2020.csv
+++ /dev/null
@@ -1,24 +0,0 @@
-suspects,refuses,cases,deaths,UF
-7,1,0,0,AL
-2,4,0,0,AM
-15,32,1,0,BA
-12,24,0,0,CE
-36,13,0,0,DF
-1,12,1,0,ES
-4,12,0,0,GO
-0,2,0,0,MA
-123,17,0,0,MG
-8,9,0,0,MS
-6,1,0,0,MT
-4,5,0,0,PA
-3,3,0,0,PB
-6,14,0,0,PE
-1,2,0,0,PI
-25,13,0,0,PR
-111,67,1,0,RJ
-7,8,0,0,RN
-1,0,0,0,RO
-112,41,0,0,RS
-59,10,0,0,SC
-3,1,0,0,SE
-222,189,10,0,SP
diff --git a/data/csv/by_day/07-02-2020.csv b/data/csv/by_day/07-02-2020.csv
deleted file mode 100644
index ff19df62..00000000
--- a/data/csv/by_day/07-02-2020.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,1,0,0,CE
-1,1,0,0,MG
-0,2,0,0,PR
-1,2,0,0,RJ
-2,6,0,0,RS
-1,3,0,0,SC
-3,11,0,0,SP
diff --git a/data/csv/by_day/07-03-2020.csv b/data/csv/by_day/07-03-2020.csv
deleted file mode 100644
index 88a10b48..00000000
--- a/data/csv/by_day/07-03-2020.csv
+++ /dev/null
@@ -1,24 +0,0 @@
-suspects,refuses,cases,deaths,UF
-7,1,0,0,AL
-2,4,0,0,AM
-15,32,2,0,BA
-13,24,0,0,CE
-30,19,1,0,DF
-1,12,1,0,ES
-4,12,0,0,GO
-0,2,0,0,MA
-123,17,0,0,MG
-6,11,0,0,MS
-6,1,0,0,MT
-4,5,0,0,PA
-3,3,0,0,PB
-6,14,0,0,PE
-1,2,0,0,PI
-20,18,0,0,PR
-111,67,2,0,RJ
-4,11,0,0,RN
-1,0,0,0,RO
-88,75,0,0,RS
-44,25,0,0,SC
-1,1,0,0,SE
-184,246,13,0,SP
diff --git a/data/csv/by_day/08-02-2020.csv b/data/csv/by_day/08-02-2020.csv
deleted file mode 100644
index a790e847..00000000
--- a/data/csv/by_day/08-02-2020.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,1,0,0,CE
-1,1,0,0,MG
-0,2,0,0,PR
-1,2,0,0,RJ
-3,6,0,0,RS
-1,3,0,0,SC
-2,13,0,0,SP
diff --git a/data/csv/by_day/08-03-2020.csv b/data/csv/by_day/08-03-2020.csv
deleted file mode 100644
index a99ba8ce..00000000
--- a/data/csv/by_day/08-03-2020.csv
+++ /dev/null
@@ -1,24 +0,0 @@
-suspects,refuses,cases,deaths,UF
-6,1,1,0,AL
-2,4,0,0,AM
-15,32,2,0,BA
-11,26,0,0,CE
-24,24,1,0,DF
-1,12,1,0,ES
-4,12,0,0,GO
-0,2,0,0,MA
-122,17,1,0,MG
-6,11,0,0,MS
-5,2,0,0,MT
-3,6,0,0,PA
-3,3,0,0,PB
-9,18,0,0,PE
-1,2,0,0,PI
-22,20,0,0,PR
-110,67,3,0,RJ
-9,13,0,0,RN
-1,0,0,0,RO
-88,75,0,0,RS
-44,26,0,0,SC
-1,1,0,0,SE
-176,258,16,0,SP
diff --git a/data/csv/by_day/09-02-2020.csv b/data/csv/by_day/09-02-2020.csv
deleted file mode 100644
index d088a4af..00000000
--- a/data/csv/by_day/09-02-2020.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,1,0,0,CE
-1,1,0,0,MG
-1,2,0,0,PR
-2,2,0,0,RJ
-3,6,0,0,RS
-1,3,0,0,SC
-3,13,0,0,SP
diff --git a/data/csv/by_day/10-02-2020.csv b/data/csv/by_day/10-02-2020.csv
deleted file mode 100644
index b329fbeb..00000000
--- a/data/csv/by_day/10-02-2020.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,1,0,0,CE
-1,1,0,0,MG
-1,2,0,0,PR
-1,3,0,0,RJ
-1,8,0,0,RS
-0,4,0,0,SC
-3,13,0,0,SP
diff --git a/data/csv/by_day/10-03-2020.csv b/data/csv/by_day/10-03-2020.csv
deleted file mode 100644
index 75dbf796..00000000
--- a/data/csv/by_day/10-03-2020.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-suspects,refuses,cases,deaths,UF
-3,0,0,0,AC
-6,1,1,0,AL
-3,4,0,0,AM
-46,35,2,0,BA
-22,42,0,0,CE
-59,24,1,0,DF
-1,12,1,0,ES
-14,14,0,0,GO
-2,2,0,0,MA
-122,18,1,0,MG
-6,11,0,0,MS
-1,7,0,0,MT
-5,12,0,0,PA
-5,6,0,0,PB
-12,22,0,0,PE
-1,2,0,0,PI
-33,20,0,0,PR
-119,85,8,0,RJ
-15,13,0,0,RN
-2,1,0,0,RO
-70,129,1,0,RS
-42,28,0,0,SC
-2,3,0,0,SE
-302,289,19,0,SP
diff --git a/data/csv/by_day/11-02-2020.csv b/data/csv/by_day/11-02-2020.csv
deleted file mode 100644
index 396b61e8..00000000
--- a/data/csv/by_day/11-02-2020.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,1,0,0,CE
-1,1,0,0,MG
-1,2,0,0,PR
-2,3,0,0,RJ
-1,8,0,0,RS
-0,4,0,0,SC
-3,14,0,0,SP
diff --git a/data/csv/by_day/11-03-2020.csv b/data/csv/by_day/11-03-2020.csv
deleted file mode 100644
index b40ea11c..00000000
--- a/data/csv/by_day/11-03-2020.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-suspects,refuses,cases,deaths,UF
-3,0,0,0,AC
-4,7,1,0,AL
-1,7,0,0,AM
-65,36,2,0,BA
-22,42,0,0,CE
-74,28,2,0,DF
-31,13,1,0,ES
-17,28,0,0,GO
-6,2,0,0,MA
-117,22,1,0,MG
-6,11,0,0,MS
-1,7,0,0,MT
-5,13,0,0,PA
-7,6,0,0,PB
-17,22,0,0,PE
-1,2,0,0,PI
-49,27,0,0,PR
-87,133,13,0,RJ
-13,14,0,0,RN
-2,1,0,0,RO
-67,159,2,0,RS
-47,32,0,0,SC
-2,3,0,0,SE
-263,320,30,0,SP
diff --git a/data/csv/by_day/12-02-2020.csv b/data/csv/by_day/12-02-2020.csv
deleted file mode 100644
index 2f34183d..00000000
--- a/data/csv/by_day/12-02-2020.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,1,0,0,CE
-1,1,0,0,MG
-1,2,0,0,PR
-2,3,0,0,RJ
-1,8,0,0,RS
-0,4,0,0,SC
-6,14,0,0,SP
diff --git a/data/csv/by_day/12-03-2020.csv b/data/csv/by_day/12-03-2020.csv
deleted file mode 100644
index 04b063e5..00000000
--- a/data/csv/by_day/12-03-2020.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-suspects,refuses,cases,deaths,UF
-3,0,0,0,AC
-6,7,1,0,AL
-1,7,0,0,AM
-65,36,2,0,BA
-22,42,0,0,CE
-82,44,2,0,DF
-51,21,1,0,ES
-15,34,0,0,GO
-6,2,0,0,MA
-117,22,1,0,MG
-9,15,0,0,MS
-6,7,0,0,MT
-5,13,0,0,PA
-10,6,0,0,PB
-18,23,2,0,PE
-1,2,0,0,PI
-54,29,6,0,PR
-76,146,16,0,RJ
-13,15,0,0,RN
-2,1,0,0,RO
-81,183,4,0,RS
-73,34,0,0,SC
-2,3,0,0,SE
-704,471,42,0,SP
diff --git a/data/csv/by_day/13-02-2020.csv b/data/csv/by_day/13-02-2020.csv
deleted file mode 100644
index 8294c5cc..00000000
--- a/data/csv/by_day/13-02-2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,1,0,0,CE
-0,1,0,0,DF
-0,2,0,0,MG
-1,2,0,0,PR
-0,5,0,0,RJ
-2,8,0,0,RS
-0,4,0,0,SC
-3,17,0,0,SP
diff --git a/data/csv/by_day/13-03-2020.csv b/data/csv/by_day/13-03-2020.csv
deleted file mode 100644
index dcdfbe16..00000000
--- a/data/csv/by_day/13-03-2020.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-suspects,refuses,cases,deaths,UF
-3,0,0,0,AC
-6,7,1,0,AL
-1,7,0,0,AM
-65,36,2,0,BA
-22,59,0,0,CE
-75,53,2,0,DF
-51,21,1,0,ES
-6,46,3,0,GO
-6,2,0,0,MA
-116,73,2,0,MG
-15,16,0,0,MS
-6,7,0,0,MT
-1,20,0,0,PA
-16,6,0,0,PB
-18,23,2,0,PE
-1,2,0,0,PI
-72,34,6,0,PR
-76,147,16,0,RJ
-12,15,1,0,RN
-2,1,0,0,RO
-81,203,4,0,RS
-77,34,2,0,SC
-2,3,0,0,SE
-753,529,56,0,SP
-2,0,0,0,TO
diff --git a/data/csv/by_day/14-02-2020.csv b/data/csv/by_day/14-02-2020.csv
deleted file mode 100644
index f0bc44db..00000000
--- a/data/csv/by_day/14-02-2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,1,0,0,CE
-0,1,0,0,DF
-0,2,0,0,MG
-1,2,0,0,PR
-0,5,0,0,RJ
-2,8,0,0,RS
-0,4,0,0,SC
-1,20,0,0,SP
diff --git a/data/csv/by_day/14-03-2020.csv b/data/csv/by_day/14-03-2020.csv
deleted file mode 100644
index 5ff73d68..00000000
--- a/data/csv/by_day/14-03-2020.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-suspects,refuses,cases,deaths,UF
-3,0,0,0,AC
-6,7,1,0,AL
-1,7,0,0,AM
-65,36,2,0,BA
-22,59,0,0,CE
-107,65,6,0,DF
-51,21,1,0,ES
-4,49,3,0,GO
-6,2,0,0,MA
-106,85,2,0,MG
-15,16,0,0,MS
-6,7,0,0,MT
-1,20,0,0,PA
-11,11,0,0,PB
-18,23,2,0,PE
-1,2,0,0,PI
-60,50,6,0,PR
-76,147,22,0,RJ
-12,15,1,0,RN
-2,1,0,0,RO
-80,203,6,0,RS
-85,39,4,0,SC
-4,3,0,0,SE
-752,545,65,0,SP
-2,0,0,0,TO
diff --git a/data/csv/by_day/15-02-2020.csv b/data/csv/by_day/15-02-2020.csv
deleted file mode 100644
index 7b4c0a57..00000000
--- a/data/csv/by_day/15-02-2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,1,0,0,CE
-0,1,0,0,DF
-0,2,0,0,MG
-0,3,0,0,PR
-0,5,0,0,RJ
-1,9,0,0,RS
-0,4,0,0,SC
-2,20,0,0,SP
diff --git a/data/csv/by_day/15-03-2020.csv b/data/csv/by_day/15-03-2020.csv
deleted file mode 100644
index 61ae3842..00000000
--- a/data/csv/by_day/15-03-2020.csv
+++ /dev/null
@@ -1,28 +0,0 @@
-suspects,refuses,cases,deaths,UF
-3,0,0,0,AC
-14,21,1,0,AL
-0,7,1,0,AM
-1,0,0,0,AP
-65,36,2,0,BA
-22,59,0,0,CE
-81,91,8,0,DF
-51,21,1,0,ES
-4,49,3,0,GO
-6,2,0,0,MA
-106,85,2,0,MG
-15,16,0,0,MS
-8,7,0,0,MT
-1,23,0,0,PA
-27,11,0,0,PB
-18,23,2,0,PE
-1,2,0,0,PI
-80,50,6,0,PR
-95,147,24,0,RJ
-14,15,1,0,RN
-2,1,0,0,RO
-2,0,0,0,RR
-66,217,6,0,RS
-102,41,6,0,SC
-1,11,1,0,SE
-1125,551,136,0,SP
-3,0,0,0,TO
diff --git a/data/csv/by_day/16-02-2020.csv b/data/csv/by_day/16-02-2020.csv
deleted file mode 100644
index 7b4c0a57..00000000
--- a/data/csv/by_day/16-02-2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,1,0,0,CE
-0,1,0,0,DF
-0,2,0,0,MG
-0,3,0,0,PR
-0,5,0,0,RJ
-1,9,0,0,RS
-0,4,0,0,SC
-2,20,0,0,SP
diff --git a/data/csv/by_day/16-03-2020.csv b/data/csv/by_day/16-03-2020.csv
deleted file mode 100644
index e663e973..00000000
--- a/data/csv/by_day/16-03-2020.csv
+++ /dev/null
@@ -1,28 +0,0 @@
-suspects,refuses,cases,deaths,UF
-3,0,0,0,AC
-16,22,1,0,AL
-0,7,1,0,AM
-2,0,0,0,AP
-65,40,2,0,BA
-22,60,0,0,CE
-107,93,13,0,DF
-50,21,1,0,ES
-3,54,3,0,GO
-6,2,0,0,MA
-102,88,5,0,MG
-12,19,2,0,MS
-14,7,0,0,MT
-1,22,0,0,PA
-33,15,0,0,PB
-18,23,2,0,PE
-2,3,0,0,PI
-85,83,6,0,PR
-96,153,31,0,RJ
-14,15,1,0,RN
-2,1,0,0,RO
-2,0,0,0,RR
-119,218,6,0,RS
-109,44,7,0,SC
-1,11,1,0,SE
-1177,623,152,0,SP
-3,0,0,0,TO
diff --git a/data/csv/by_day/17-02-2020.csv b/data/csv/by_day/17-02-2020.csv
deleted file mode 100644
index 7b4c0a57..00000000
--- a/data/csv/by_day/17-02-2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,1,0,0,CE
-0,1,0,0,DF
-0,2,0,0,MG
-0,3,0,0,PR
-0,5,0,0,RJ
-1,9,0,0,RS
-0,4,0,0,SC
-2,20,0,0,SP
diff --git a/data/csv/by_day/17-03-2020.csv b/data/csv/by_day/17-03-2020.csv
deleted file mode 100644
index 64151395..00000000
--- a/data/csv/by_day/17-03-2020.csv
+++ /dev/null
@@ -1,28 +0,0 @@
-suspects,refuses,cases,deaths,UF
-8,0,0,0,AC
-34,20,1,0,AL
-7,19,1,0,AM
-6,0,0,0,AP
-375,59,3,0,BA
-211,95,5,0,CE
-253,96,22,0,DF
-69,21,1,0,ES
-221,54,6,0,GO
-52,8,0,0,MA
-563,99,7,0,MG
-44,45,4,0,MS
-23,7,0,0,MT
-21,22,0,0,PA
-48,15,0,0,PB
-71,33,16,0,PE
-14,4,0,0,PI
-240,82,6,0,PR
-859,194,33,0,RJ
-72,21,1,0,RN
-38,3,0,0,RO
-5,0,0,0,RR
-300,217,10,0,RS
-220,55,7,0,SC
-7,12,4,0,SE
-5047,709,164,1,SP
-11,0,0,0,TO
diff --git a/data/csv/by_day/18-02-2020.csv b/data/csv/by_day/18-02-2020.csv
deleted file mode 100644
index cc9667fd..00000000
--- a/data/csv/by_day/18-02-2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,1,0,0,CE
-0,2,0,0,MG
-0,3,0,0,PR
-0,5,0,0,RJ
-1,9,0,0,RS
-0,4,0,0,SC
-4,20,0,0,SP
-0,1,0,0,
diff --git a/data/csv/by_day/18-03-2020.csv b/data/csv/by_day/18-03-2020.csv
deleted file mode 100644
index bbe0bb9b..00000000
--- a/data/csv/by_day/18-03-2020.csv
+++ /dev/null
@@ -1,28 +0,0 @@
-suspects,refuses,cases,deaths,UF
-12,0,0,0,AC
-43,22,1,0,AL
-18,26,1,0,AM
-15,0,0,0,AP
-573,36,3,0,BA
-493,89,9,0,CE
-327,107,26,0,DF
-71,21,9,0,ES
-353,55,8,0,GO
-125,13,0,0,MA
-925,104,15,0,MG
-93,26,7,0,MS
-45,8,0,0,MT
-43,23,0,0,PA
-85,11,0,0,PB
-89,23,16,0,PE
-12,2,0,0,PI
-400,119,13,0,PR
-1254,148,45,0,RJ
-108,22,1,0,RN
-61,2,0,0,RO
-9,0,0,0,RR
-416,330,19,0,RS
-346,47,10,0,SC
-15,11,5,0,SE
-5334,596,240,4,SP
-13,0,0,0,TO
diff --git a/data/csv/by_day/19-02-2020.csv b/data/csv/by_day/19-02-2020.csv
deleted file mode 100644
index 949c341a..00000000
--- a/data/csv/by_day/19-02-2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,1,0,0,CE
-0,1,0,0,DF
-0,2,0,0,MG
-0,3,0,0,PR
-0,5,0,0,RJ
-1,9,0,0,RS
-0,4,0,0,SC
-1,23,0,0,SP
diff --git a/data/csv/by_day/20-02-2020.csv b/data/csv/by_day/20-02-2020.csv
deleted file mode 100644
index e1d72b2d..00000000
--- a/data/csv/by_day/20-02-2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,1,0,0,CE
-0,1,0,0,DF
-0,2,0,0,MG
-0,3,0,0,PR
-0,5,0,0,RJ
-0,10,0,0,RS
-0,4,0,0,SC
-1,24,0,0,SP
diff --git a/data/csv/by_day/21-02-2020.csv b/data/csv/by_day/21-02-2020.csv
deleted file mode 100644
index 7605fe97..00000000
--- a/data/csv/by_day/21-02-2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,1,0,0,CE
-0,1,0,0,DF
-0,2,0,0,MG
-0,3,0,0,PR
-1,5,0,0,RJ
-0,10,0,0,RS
-0,4,0,0,SC
-0,25,0,0,SP
diff --git a/data/csv/by_day/22-02-2020.csv b/data/csv/by_day/22-02-2020.csv
deleted file mode 100644
index 1254e144..00000000
--- a/data/csv/by_day/22-02-2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,1,0,0,CE
-0,1,0,0,DF
-0,2,0,0,MG
-0,3,0,0,PR
-1,6,0,0,RJ
-0,10,0,0,RS
-0,4,0,0,SC
-0,25,0,0,SP
diff --git a/data/csv/by_day/23-02-2020.csv b/data/csv/by_day/23-02-2020.csv
deleted file mode 100644
index a6d35ac1..00000000
--- a/data/csv/by_day/23-02-2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,1,0,0,CE
-0,1,0,0,DF
-0,2,0,0,MG
-0,3,0,0,PR
-1,7,0,0,RJ
-0,10,0,0,RS
-0,4,0,0,SC
-1,25,0,0,SP
diff --git a/data/csv/by_day/24-02-2020.csv b/data/csv/by_day/24-02-2020.csv
deleted file mode 100644
index fce5957f..00000000
--- a/data/csv/by_day/24-02-2020.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,1,0,0,CE
-0,1,0,0,DF
-0,2,0,0,MG
-0,3,0,0,PR
-1,7,0,0,RJ
-0,10,0,0,RS
-0,4,0,0,SC
-3,26,0,0,SP
diff --git a/data/csv/by_day/25-02-2020.csv b/data/csv/by_day/25-02-2020.csv
deleted file mode 100644
index 7839053b..00000000
--- a/data/csv/by_day/25-02-2020.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,1,0,0,CE
-0,1,0,0,CE
-0,1,0,0,DF
-0,1,0,0,DF
-0,2,0,0,MG
-0,2,0,0,MG
-0,3,0,0,PR
-0,3,0,0,PR
-0,8,0,0,RJ
-0,8,0,0,RJ
-0,10,0,0,RS
-0,10,0,0,RS
-0,4,0,0,SC
-0,4,0,0,SC
-4,26,0,0,SP
-4,26,0,0,SP
diff --git a/data/csv/by_day/26-02-2020.csv b/data/csv/by_day/26-02-2020.csv
deleted file mode 100644
index 6c445d04..00000000
--- a/data/csv/by_day/26-02-2020.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-suspects,refuses,cases,deaths,UF
-0,2,0,0,BA
-0,1,0,0,CE
-0,1,0,0,DF
-1,0,0,0,ES
-2,2,0,0,MG
-1,0,0,0,PB
-1,0,0,0,PE
-0,3,0,0,PR
-2,8,0,0,RJ
-0,10,0,0,RS
-2,4,0,0,SC
-11,28,1,0,SP
diff --git a/data/csv/by_day/27-02-2020.csv b/data/csv/by_day/27-02-2020.csv
deleted file mode 100644
index 1810617d..00000000
--- a/data/csv/by_day/27-02-2020.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-suspects,refuses,cases,deaths,UF
-1,0,0,0,AL
-1,2,0,0,BA
-5,1,0,0,CE
-5,1,0,0,DF
-1,0,0,0,ES
-3,0,0,0,GO
-5,3,0,0,MG
-2,0,0,0,MS
-1,0,0,0,PB
-3,0,0,0,PE
-5,3,0,0,PR
-9,8,0,0,RJ
-4,0,0,0,RN
-24,10,0,0,RS
-8,4,0,0,SC
-55,28,1,0,SP
diff --git a/data/csv/by_day/28-02-2020.csv b/data/csv/by_day/28-02-2020.csv
deleted file mode 100644
index 34ab3431..00000000
--- a/data/csv/by_day/28-02-2020.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-suspects,refuses,cases,deaths,UF
-1,0,0,0,AL
-9,4,0,0,BA
-6,2,0,0,CE
-5,1,0,0,DF
-2,1,0,0,ES
-5,0,0,0,GO
-17,3,0,0,MG
-2,0,0,0,MS
-1,1,0,0,PB
-5,2,0,0,PE
-5,3,0,0,PR
-19,8,0,0,RJ
-3,2,0,0,RN
-27,10,0,0,RS
-9,4,0,0,SC
-66,30,1,0,SP
diff --git a/data/csv/by_day/29-02-2020.csv b/data/csv/by_day/29-02-2020.csv
deleted file mode 100644
index 9db5c3aa..00000000
--- a/data/csv/by_day/29-02-2020.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-suspects,refuses,cases,deaths,UF
-1,0,0,0,AL
-9,4,0,0,BA
-6,2,0,0,CE
-5,1,0,0,DF
-2,1,0,0,ES
-5,0,0,0,GO
-17,3,0,0,MG
-2,0,0,0,MS
-1,1,0,0,PB
-5,2,0,0,PE
-5,3,0,0,PR
-19,8,0,0,RJ
-3,2,0,0,RN
-27,10,0,0,RS
-9,4,0,0,SC
-91,38,2,0,SP
diff --git a/data/csv/by_day/30-01-2020.csv b/data/csv/by_day/30-01-2020.csv
deleted file mode 100644
index 8644ebfd..00000000
--- a/data/csv/by_day/30-01-2020.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-suspects,refuses,cases,deaths,UF
-1,0,0,0,CE
-1,0,0,0,MG
-1,1,0,0,PR
-1,0,0,0,RJ
-2,2,0,0,RS
-0,2,0,0,SC
-3,1,0,0,SP
diff --git a/data/csv/by_day/31-01-2020.csv b/data/csv/by_day/31-01-2020.csv
deleted file mode 100644
index 7b8f00c5..00000000
--- a/data/csv/by_day/31-01-2020.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-suspects,refuses,cases,deaths,UF
-1,0,0,0,CE
-1,0,0,0,MG
-1,1,0,0,PR
-0,1,0,0,RJ
-2,3,0,0,RS
-1,2,0,0,SC
-7,2,0,0,SP
diff --git a/data/csv/by_uf/AC.csv b/data/csv/by_uf/AC.csv
deleted file mode 100644
index a8c9dd90..00000000
--- a/data/csv/by_uf/AC.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-03-10,3,0,0,0
-2020-03-11,3,0,0,0
-2020-03-12,3,0,0,0
-2020-03-13,3,0,0,0
-2020-03-14,3,0,0,0
-2020-03-15,3,0,0,0
-2020-03-16,3,0,0,0
-2020-03-17,8,0,0,0
-2020-03-18,12,0,0,0
diff --git a/data/csv/by_uf/AL.csv b/data/csv/by_uf/AL.csv
deleted file mode 100644
index 0ee83529..00000000
--- a/data/csv/by_uf/AL.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-02-27,1,0,0,0
-2020-02-28,1,0,0,0
-2020-02-29,1,0,0,0
-2020-03-01,1,0,0,0
-2020-03-02,3,1,0,0
-2020-03-03,5,1,0,0
-2020-03-04,5,1,0,0
-2020-03-05,6,1,0,0
-2020-03-06,7,1,0,0
-2020-03-07,7,1,0,0
-2020-03-08,6,1,1,0
-2020-03-10,6,1,1,0
-2020-03-11,4,7,1,0
-2020-03-12,6,7,1,0
-2020-03-13,6,7,1,0
-2020-03-14,6,7,1,0
-2020-03-15,14,21,1,0
-2020-03-16,16,22,1,0
-2020-03-17,34,20,1,0
-2020-03-18,43,22,1,0
diff --git a/data/csv/by_uf/AM.csv b/data/csv/by_uf/AM.csv
deleted file mode 100644
index 77fad7cb..00000000
--- a/data/csv/by_uf/AM.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-03-02,1,1,0,0
-2020-03-03,3,1,0,0
-2020-03-04,4,1,0,0
-2020-03-05,5,1,0,0
-2020-03-06,2,4,0,0
-2020-03-07,2,4,0,0
-2020-03-08,2,4,0,0
-2020-03-10,3,4,0,0
-2020-03-11,1,7,0,0
-2020-03-12,1,7,0,0
-2020-03-13,1,7,0,0
-2020-03-14,1,7,0,0
-2020-03-15,0,7,1,0
-2020-03-16,0,7,1,0
-2020-03-17,7,19,1,0
-2020-03-18,18,26,1,0
diff --git a/data/csv/by_uf/AP.csv b/data/csv/by_uf/AP.csv
deleted file mode 100644
index 40fcb2fb..00000000
--- a/data/csv/by_uf/AP.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-03-15,1,0,0,0
-2020-03-16,2,0,0,0
-2020-03-17,6,0,0,0
-2020-03-18,15,0,0,0
diff --git a/data/csv/by_uf/BA.csv b/data/csv/by_uf/BA.csv
deleted file mode 100644
index 0f8aa542..00000000
--- a/data/csv/by_uf/BA.csv
+++ /dev/null
@@ -1,22 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-02-26,0,2,0,0
-2020-02-27,1,2,0,0
-2020-02-28,9,4,0,0
-2020-02-29,9,4,0,0
-2020-03-01,9,4,0,0
-2020-03-02,9,14,0,0
-2020-03-03,21,16,0,0
-2020-03-04,19,21,0,0
-2020-03-05,23,29,0,0
-2020-03-06,15,32,1,0
-2020-03-07,15,32,2,0
-2020-03-08,15,32,2,0
-2020-03-10,46,35,2,0
-2020-03-11,65,36,2,0
-2020-03-12,65,36,2,0
-2020-03-13,65,36,2,0
-2020-03-14,65,36,2,0
-2020-03-15,65,36,2,0
-2020-03-16,65,40,2,0
-2020-03-17,375,59,3,0
-2020-03-18,573,36,3,0
diff --git a/data/csv/by_uf/CE.csv b/data/csv/by_uf/CE.csv
deleted file mode 100644
index 4ea78896..00000000
--- a/data/csv/by_uf/CE.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-01-30,1,0,0,0
-2020-01-31,1,0,0,0
-2020-02-01,1,0,0,0
-2020-02-02,1,0,0,0
-2020-02-03,0,1,0,0
-2020-02-04,0,1,0,0
-2020-02-05,0,1,0,0
-2020-02-06,0,1,0,0
-2020-02-06,0,1,0,0
-2020-02-07,0,1,0,0
-2020-02-08,0,1,0,0
-2020-02-09,0,1,0,0
-2020-02-10,0,1,0,0
-2020-02-11,0,1,0,0
-2020-02-12,0,1,0,0
-2020-02-13,0,1,0,0
-2020-02-14,0,1,0,0
-2020-02-15,0,1,0,0
-2020-02-16,0,1,0,0
-2020-02-17,0,1,0,0
-2020-02-18,0,1,0,0
-2020-02-19,0,1,0,0
-2020-02-20,0,1,0,0
-2020-02-21,0,1,0,0
-2020-02-22,0,1,0,0
-2020-02-23,0,1,0,0
-2020-02-24,0,1,0,0
-2020-02-25,0,1,0,0
-2020-02-25,0,1,0,0
-2020-02-26,0,1,0,0
-2020-02-27,5,1,0,0
-2020-02-28,6,2,0,0
-2020-02-29,6,2,0,0
-2020-03-01,6,2,0,0
-2020-03-02,6,6,0,0
-2020-03-03,19,9,0,0
-2020-03-04,14,18,0,0
-2020-03-05,16,18,0,0
-2020-03-06,12,24,0,0
-2020-03-07,13,24,0,0
-2020-03-08,11,26,0,0
-2020-03-10,22,42,0,0
-2020-03-11,22,42,0,0
-2020-03-12,22,42,0,0
-2020-03-13,22,59,0,0
-2020-03-14,22,59,0,0
-2020-03-15,22,59,0,0
-2020-03-16,22,60,0,0
-2020-03-17,211,95,5,0
-2020-03-18,493,89,9,0
diff --git a/data/csv/by_uf/DF.csv b/data/csv/by_uf/DF.csv
deleted file mode 100644
index 6ca66f92..00000000
--- a/data/csv/by_uf/DF.csv
+++ /dev/null
@@ -1,35 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-02-13,0,1,0,0
-2020-02-14,0,1,0,0
-2020-02-15,0,1,0,0
-2020-02-16,0,1,0,0
-2020-02-17,0,1,0,0
-2020-02-19,0,1,0,0
-2020-02-20,0,1,0,0
-2020-02-21,0,1,0,0
-2020-02-22,0,1,0,0
-2020-02-23,0,1,0,0
-2020-02-24,0,1,0,0
-2020-02-25,0,1,0,0
-2020-02-25,0,1,0,0
-2020-02-26,0,1,0,0
-2020-02-27,5,1,0,0
-2020-02-28,5,1,0,0
-2020-02-29,5,1,0,0
-2020-03-01,5,1,0,0
-2020-03-02,12,3,0,0
-2020-03-03,12,3,0,0
-2020-03-04,18,5,0,0
-2020-03-05,20,9,0,0
-2020-03-06,36,13,0,0
-2020-03-07,30,19,1,0
-2020-03-08,24,24,1,0
-2020-03-10,59,24,1,0
-2020-03-11,74,28,2,0
-2020-03-12,82,44,2,0
-2020-03-13,75,53,2,0
-2020-03-14,107,65,6,0
-2020-03-15,81,91,8,0
-2020-03-16,107,93,13,0
-2020-03-17,253,96,22,0
-2020-03-18,327,107,26,0
diff --git a/data/csv/by_uf/ES.csv b/data/csv/by_uf/ES.csv
deleted file mode 100644
index 154455c1..00000000
--- a/data/csv/by_uf/ES.csv
+++ /dev/null
@@ -1,22 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-02-26,1,0,0,0
-2020-02-27,1,0,0,0
-2020-02-28,2,1,0,0
-2020-02-29,2,1,0,0
-2020-03-01,2,1,0,0
-2020-03-02,5,6,0,0
-2020-03-03,5,6,0,0
-2020-03-04,5,7,0,0
-2020-03-05,5,8,0,0
-2020-03-06,1,12,1,0
-2020-03-07,1,12,1,0
-2020-03-08,1,12,1,0
-2020-03-10,1,12,1,0
-2020-03-11,31,13,1,0
-2020-03-12,51,21,1,0
-2020-03-13,51,21,1,0
-2020-03-14,51,21,1,0
-2020-03-15,51,21,1,0
-2020-03-16,50,21,1,0
-2020-03-17,69,21,1,0
-2020-03-18,71,21,9,0
diff --git a/data/csv/by_uf/GO.csv b/data/csv/by_uf/GO.csv
deleted file mode 100644
index c7063a19..00000000
--- a/data/csv/by_uf/GO.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-02-27,3,0,0,0
-2020-02-28,5,0,0,0
-2020-02-29,5,0,0,0
-2020-03-01,5,0,0,0
-2020-03-02,3,7,0,0
-2020-03-03,7,7,0,0
-2020-03-04,1,12,0,0
-2020-03-05,4,12,0,0
-2020-03-06,4,12,0,0
-2020-03-07,4,12,0,0
-2020-03-08,4,12,0,0
-2020-03-10,14,14,0,0
-2020-03-11,17,28,0,0
-2020-03-12,15,34,0,0
-2020-03-13,6,46,3,0
-2020-03-14,4,49,3,0
-2020-03-15,4,49,3,0
-2020-03-16,3,54,3,0
-2020-03-17,221,54,6,0
-2020-03-18,353,55,8,0
diff --git a/data/csv/by_uf/MA.csv b/data/csv/by_uf/MA.csv
deleted file mode 100644
index 0e9bd04f..00000000
--- a/data/csv/by_uf/MA.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-03-02,1,1,0,0
-2020-03-03,1,1,0,0
-2020-03-04,0,2,0,0
-2020-03-05,0,2,0,0
-2020-03-06,0,2,0,0
-2020-03-07,0,2,0,0
-2020-03-08,0,2,0,0
-2020-03-10,2,2,0,0
-2020-03-11,6,2,0,0
-2020-03-12,6,2,0,0
-2020-03-13,6,2,0,0
-2020-03-14,6,2,0,0
-2020-03-15,6,2,0,0
-2020-03-16,6,2,0,0
-2020-03-17,52,8,0,0
-2020-03-18,125,13,0,0
diff --git a/data/csv/by_uf/MG.csv b/data/csv/by_uf/MG.csv
deleted file mode 100644
index ecc52f2b..00000000
--- a/data/csv/by_uf/MG.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-01-30,1,0,0,0
-2020-01-31,1,0,0,0
-2020-02-01,0,1,0,0
-2020-02-02,0,1,0,0
-2020-02-03,0,1,0,0
-2020-02-04,0,1,0,0
-2020-02-05,0,1,0,0
-2020-02-06,1,1,0,0
-2020-02-06,1,1,0,0
-2020-02-07,1,1,0,0
-2020-02-08,1,1,0,0
-2020-02-09,1,1,0,0
-2020-02-10,1,1,0,0
-2020-02-11,1,1,0,0
-2020-02-12,1,1,0,0
-2020-02-13,0,2,0,0
-2020-02-14,0,2,0,0
-2020-02-15,0,2,0,0
-2020-02-16,0,2,0,0
-2020-02-17,0,2,0,0
-2020-02-18,0,2,0,0
-2020-02-19,0,2,0,0
-2020-02-20,0,2,0,0
-2020-02-21,0,2,0,0
-2020-02-22,0,2,0,0
-2020-02-23,0,2,0,0
-2020-02-24,0,2,0,0
-2020-02-25,0,2,0,0
-2020-02-25,0,2,0,0
-2020-02-26,2,2,0,0
-2020-02-27,5,3,0,0
-2020-02-28,17,3,0,0
-2020-02-29,17,3,0,0
-2020-03-01,17,3,0,0
-2020-03-02,48,4,0,0
-2020-03-03,58,6,0,0
-2020-03-04,82,6,0,0
-2020-03-05,80,12,0,0
-2020-03-06,123,17,0,0
-2020-03-07,123,17,0,0
-2020-03-08,122,17,1,0
-2020-03-10,122,18,1,0
-2020-03-11,117,22,1,0
-2020-03-12,117,22,1,0
-2020-03-13,116,73,2,0
-2020-03-14,106,85,2,0
-2020-03-15,106,85,2,0
-2020-03-16,102,88,5,0
-2020-03-17,563,99,7,0
-2020-03-18,925,104,15,0
diff --git a/data/csv/by_uf/MS.csv b/data/csv/by_uf/MS.csv
deleted file mode 100644
index 4acd17a3..00000000
--- a/data/csv/by_uf/MS.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-02-27,2,0,0,0
-2020-02-28,2,0,0,0
-2020-02-29,2,0,0,0
-2020-03-01,2,0,0,0
-2020-03-02,6,1,0,0
-2020-03-03,6,1,0,0
-2020-03-04,10,3,0,0
-2020-03-05,11,3,0,0
-2020-03-06,8,9,0,0
-2020-03-07,6,11,0,0
-2020-03-08,6,11,0,0
-2020-03-10,6,11,0,0
-2020-03-11,6,11,0,0
-2020-03-12,9,15,0,0
-2020-03-13,15,16,0,0
-2020-03-14,15,16,0,0
-2020-03-15,15,16,0,0
-2020-03-16,12,19,2,0
-2020-03-17,44,45,4,0
-2020-03-18,93,26,7,0
diff --git a/data/csv/by_uf/MT.csv b/data/csv/by_uf/MT.csv
deleted file mode 100644
index 89f51a4a..00000000
--- a/data/csv/by_uf/MT.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-03-02,5,0,0,0
-2020-03-03,6,0,0,0
-2020-03-04,6,0,0,0
-2020-03-05,6,0,0,0
-2020-03-06,6,1,0,0
-2020-03-07,6,1,0,0
-2020-03-08,5,2,0,0
-2020-03-10,1,7,0,0
-2020-03-11,1,7,0,0
-2020-03-12,6,7,0,0
-2020-03-13,6,7,0,0
-2020-03-14,6,7,0,0
-2020-03-15,8,7,0,0
-2020-03-16,14,7,0,0
-2020-03-17,23,7,0,0
-2020-03-18,45,8,0,0
diff --git a/data/csv/by_uf/PA.csv b/data/csv/by_uf/PA.csv
deleted file mode 100644
index 095b0ea0..00000000
--- a/data/csv/by_uf/PA.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-03-02,2,2,0,0
-2020-03-03,1,4,0,0
-2020-03-04,1,4,0,0
-2020-03-05,1,5,0,0
-2020-03-06,4,5,0,0
-2020-03-07,4,5,0,0
-2020-03-08,3,6,0,0
-2020-03-10,5,12,0,0
-2020-03-11,5,13,0,0
-2020-03-12,5,13,0,0
-2020-03-13,1,20,0,0
-2020-03-14,1,20,0,0
-2020-03-15,1,23,0,0
-2020-03-16,1,22,0,0
-2020-03-17,21,22,0,0
-2020-03-18,43,23,0,0
diff --git a/data/csv/by_uf/PB.csv b/data/csv/by_uf/PB.csv
deleted file mode 100644
index 9e158ed5..00000000
--- a/data/csv/by_uf/PB.csv
+++ /dev/null
@@ -1,22 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-02-26,1,0,0,0
-2020-02-27,1,0,0,0
-2020-02-28,1,1,0,0
-2020-02-29,1,1,0,0
-2020-03-01,1,1,0,0
-2020-03-02,2,1,0,0
-2020-03-03,4,1,0,0
-2020-03-04,4,1,0,0
-2020-03-05,4,1,0,0
-2020-03-06,3,3,0,0
-2020-03-07,3,3,0,0
-2020-03-08,3,3,0,0
-2020-03-10,5,6,0,0
-2020-03-11,7,6,0,0
-2020-03-12,10,6,0,0
-2020-03-13,16,6,0,0
-2020-03-14,11,11,0,0
-2020-03-15,27,11,0,0
-2020-03-16,33,15,0,0
-2020-03-17,48,15,0,0
-2020-03-18,85,11,0,0
diff --git a/data/csv/by_uf/PE.csv b/data/csv/by_uf/PE.csv
deleted file mode 100644
index dc77d73d..00000000
--- a/data/csv/by_uf/PE.csv
+++ /dev/null
@@ -1,22 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-02-26,1,0,0,0
-2020-02-27,3,0,0,0
-2020-02-28,5,2,0,0
-2020-02-29,5,2,0,0
-2020-03-01,5,2,0,0
-2020-03-02,4,10,0,0
-2020-03-03,4,11,0,0
-2020-03-04,6,11,0,0
-2020-03-05,8,12,0,0
-2020-03-06,6,14,0,0
-2020-03-07,6,14,0,0
-2020-03-08,9,18,0,0
-2020-03-10,12,22,0,0
-2020-03-11,17,22,0,0
-2020-03-12,18,23,2,0
-2020-03-13,18,23,2,0
-2020-03-14,18,23,2,0
-2020-03-15,18,23,2,0
-2020-03-16,18,23,2,0
-2020-03-17,71,33,16,0
-2020-03-18,89,23,16,0
diff --git a/data/csv/by_uf/PI.csv b/data/csv/by_uf/PI.csv
deleted file mode 100644
index 8a95be4f..00000000
--- a/data/csv/by_uf/PI.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-03-02,1,2,0,0
-2020-03-03,1,2,0,0
-2020-03-04,1,2,0,0
-2020-03-05,1,2,0,0
-2020-03-06,1,2,0,0
-2020-03-07,1,2,0,0
-2020-03-08,1,2,0,0
-2020-03-10,1,2,0,0
-2020-03-11,1,2,0,0
-2020-03-12,1,2,0,0
-2020-03-13,1,2,0,0
-2020-03-14,1,2,0,0
-2020-03-15,1,2,0,0
-2020-03-16,2,3,0,0
-2020-03-17,14,4,0,0
-2020-03-18,12,2,0,0
diff --git a/data/csv/by_uf/PR.csv b/data/csv/by_uf/PR.csv
deleted file mode 100644
index 18583ca6..00000000
--- a/data/csv/by_uf/PR.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-01-30,1,1,0,0
-2020-01-31,1,1,0,0
-2020-02-01,1,1,0,0
-2020-02-02,1,1,0,0
-2020-02-03,0,2,0,0
-2020-02-04,0,2,0,0
-2020-02-05,0,2,0,0
-2020-02-06,0,2,0,0
-2020-02-06,0,2,0,0
-2020-02-07,0,2,0,0
-2020-02-08,0,2,0,0
-2020-02-09,1,2,0,0
-2020-02-10,1,2,0,0
-2020-02-11,1,2,0,0
-2020-02-12,1,2,0,0
-2020-02-13,1,2,0,0
-2020-02-14,1,2,0,0
-2020-02-15,0,3,0,0
-2020-02-16,0,3,0,0
-2020-02-17,0,3,0,0
-2020-02-18,0,3,0,0
-2020-02-19,0,3,0,0
-2020-02-20,0,3,0,0
-2020-02-21,0,3,0,0
-2020-02-22,0,3,0,0
-2020-02-23,0,3,0,0
-2020-02-24,0,3,0,0
-2020-02-25,0,3,0,0
-2020-02-25,0,3,0,0
-2020-02-26,0,3,0,0
-2020-02-27,5,3,0,0
-2020-02-28,5,3,0,0
-2020-02-29,5,3,0,0
-2020-03-01,5,3,0,0
-2020-03-02,7,8,0,0
-2020-03-03,14,8,0,0
-2020-03-04,13,8,0,0
-2020-03-05,20,9,0,0
-2020-03-06,25,13,0,0
-2020-03-07,20,18,0,0
-2020-03-08,22,20,0,0
-2020-03-10,33,20,0,0
-2020-03-11,49,27,0,0
-2020-03-12,54,29,6,0
-2020-03-13,72,34,6,0
-2020-03-14,60,50,6,0
-2020-03-15,80,50,6,0
-2020-03-16,85,83,6,0
-2020-03-17,240,82,6,0
-2020-03-18,400,119,13,0
diff --git a/data/csv/by_uf/RJ.csv b/data/csv/by_uf/RJ.csv
deleted file mode 100644
index d20457fc..00000000
--- a/data/csv/by_uf/RJ.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-01-30,1,0,0,0
-2020-01-31,0,1,0,0
-2020-02-01,0,1,0,0
-2020-02-02,0,1,0,0
-2020-02-03,1,1,0,0
-2020-02-04,1,2,0,0
-2020-02-05,1,2,0,0
-2020-02-06,1,2,0,0
-2020-02-06,1,2,0,0
-2020-02-07,1,2,0,0
-2020-02-08,1,2,0,0
-2020-02-09,2,2,0,0
-2020-02-10,1,3,0,0
-2020-02-11,2,3,0,0
-2020-02-12,2,3,0,0
-2020-02-13,0,5,0,0
-2020-02-14,0,5,0,0
-2020-02-15,0,5,0,0
-2020-02-16,0,5,0,0
-2020-02-17,0,5,0,0
-2020-02-18,0,5,0,0
-2020-02-19,0,5,0,0
-2020-02-20,0,5,0,0
-2020-02-21,1,5,0,0
-2020-02-22,1,6,0,0
-2020-02-23,1,7,0,0
-2020-02-24,1,7,0,0
-2020-02-25,0,8,0,0
-2020-02-25,0,8,0,0
-2020-02-26,2,8,0,0
-2020-02-27,9,8,0,0
-2020-02-28,19,8,0,0
-2020-02-29,19,8,0,0
-2020-03-01,19,8,0,0
-2020-03-02,42,27,0,0
-2020-03-03,62,29,0,0
-2020-03-04,55,52,0,0
-2020-03-05,79,58,1,0
-2020-03-06,111,67,1,0
-2020-03-07,111,67,2,0
-2020-03-08,110,67,3,0
-2020-03-10,119,85,8,0
-2020-03-11,87,133,13,0
-2020-03-12,76,146,16,0
-2020-03-13,76,147,16,0
-2020-03-14,76,147,22,0
-2020-03-15,95,147,24,0
-2020-03-16,96,153,31,0
-2020-03-17,859,194,33,0
-2020-03-18,1254,148,45,0
diff --git a/data/csv/by_uf/RN.csv b/data/csv/by_uf/RN.csv
deleted file mode 100644
index f6f40a15..00000000
--- a/data/csv/by_uf/RN.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-02-27,4,0,0,0
-2020-02-28,3,2,0,0
-2020-02-29,3,2,0,0
-2020-03-01,3,2,0,0
-2020-03-02,2,6,0,0
-2020-03-03,2,6,0,0
-2020-03-04,5,6,0,0
-2020-03-05,4,8,0,0
-2020-03-06,7,8,0,0
-2020-03-07,4,11,0,0
-2020-03-08,9,13,0,0
-2020-03-10,15,13,0,0
-2020-03-11,13,14,0,0
-2020-03-12,13,15,0,0
-2020-03-13,12,15,1,0
-2020-03-14,12,15,1,0
-2020-03-15,14,15,1,0
-2020-03-16,14,15,1,0
-2020-03-17,72,21,1,0
-2020-03-18,108,22,1,0
diff --git a/data/csv/by_uf/RO.csv b/data/csv/by_uf/RO.csv
deleted file mode 100644
index 5dccc6dc..00000000
--- a/data/csv/by_uf/RO.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-03-02,1,0,0,0
-2020-03-03,1,0,0,0
-2020-03-04,1,0,0,0
-2020-03-05,1,0,0,0
-2020-03-06,1,0,0,0
-2020-03-07,1,0,0,0
-2020-03-08,1,0,0,0
-2020-03-10,2,1,0,0
-2020-03-11,2,1,0,0
-2020-03-12,2,1,0,0
-2020-03-13,2,1,0,0
-2020-03-14,2,1,0,0
-2020-03-15,2,1,0,0
-2020-03-16,2,1,0,0
-2020-03-17,38,3,0,0
-2020-03-18,61,2,0,0
diff --git a/data/csv/by_uf/RR.csv b/data/csv/by_uf/RR.csv
deleted file mode 100644
index 8c4f72be..00000000
--- a/data/csv/by_uf/RR.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-03-15,2,0,0,0
-2020-03-16,2,0,0,0
-2020-03-17,5,0,0,0
-2020-03-18,9,0,0,0
diff --git a/data/csv/by_uf/RS.csv b/data/csv/by_uf/RS.csv
deleted file mode 100644
index 2f1fad51..00000000
--- a/data/csv/by_uf/RS.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-01-30,2,2,0,0
-2020-01-31,2,3,0,0
-2020-02-01,4,3,0,0
-2020-02-02,4,3,0,0
-2020-02-03,4,3,0,0
-2020-02-04,4,3,0,0
-2020-02-05,5,3,0,0
-2020-02-06,3,5,0,0
-2020-02-06,3,5,0,0
-2020-02-07,2,6,0,0
-2020-02-08,3,6,0,0
-2020-02-09,3,6,0,0
-2020-02-10,1,8,0,0
-2020-02-11,1,8,0,0
-2020-02-12,1,8,0,0
-2020-02-13,2,8,0,0
-2020-02-14,2,8,0,0
-2020-02-15,1,9,0,0
-2020-02-16,1,9,0,0
-2020-02-17,1,9,0,0
-2020-02-18,1,9,0,0
-2020-02-19,1,9,0,0
-2020-02-20,0,10,0,0
-2020-02-21,0,10,0,0
-2020-02-22,0,10,0,0
-2020-02-23,0,10,0,0
-2020-02-24,0,10,0,0
-2020-02-25,0,10,0,0
-2020-02-25,0,10,0,0
-2020-02-26,0,10,0,0
-2020-02-27,24,10,0,0
-2020-02-28,27,10,0,0
-2020-02-29,27,10,0,0
-2020-03-01,27,10,0,0
-2020-03-02,73,10,0,0
-2020-03-03,82,20,0,0
-2020-03-04,98,20,0,0
-2020-03-05,104,25,0,0
-2020-03-06,112,41,0,0
-2020-03-07,88,75,0,0
-2020-03-08,88,75,0,0
-2020-03-10,70,129,1,0
-2020-03-11,67,159,2,0
-2020-03-12,81,183,4,0
-2020-03-13,81,203,4,0
-2020-03-14,80,203,6,0
-2020-03-15,66,217,6,0
-2020-03-16,119,218,6,0
-2020-03-17,300,217,10,0
-2020-03-18,416,330,19,0
diff --git a/data/csv/by_uf/SC.csv b/data/csv/by_uf/SC.csv
deleted file mode 100644
index 9c35bc2e..00000000
--- a/data/csv/by_uf/SC.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-01-30,0,2,0,0
-2020-01-31,1,2,0,0
-2020-02-01,2,2,0,0
-2020-02-02,2,2,0,0
-2020-02-03,2,2,0,0
-2020-02-04,2,2,0,0
-2020-02-05,1,3,0,0
-2020-02-06,1,3,0,0
-2020-02-06,1,3,0,0
-2020-02-07,1,3,0,0
-2020-02-08,1,3,0,0
-2020-02-09,1,3,0,0
-2020-02-10,0,4,0,0
-2020-02-11,0,4,0,0
-2020-02-12,0,4,0,0
-2020-02-13,0,4,0,0
-2020-02-14,0,4,0,0
-2020-02-15,0,4,0,0
-2020-02-16,0,4,0,0
-2020-02-17,0,4,0,0
-2020-02-18,0,4,0,0
-2020-02-19,0,4,0,0
-2020-02-20,0,4,0,0
-2020-02-21,0,4,0,0
-2020-02-22,0,4,0,0
-2020-02-23,0,4,0,0
-2020-02-24,0,4,0,0
-2020-02-25,0,4,0,0
-2020-02-25,0,4,0,0
-2020-02-26,2,4,0,0
-2020-02-27,8,4,0,0
-2020-02-28,9,4,0,0
-2020-02-29,9,4,0,0
-2020-03-01,9,4,0,0
-2020-03-02,36,4,0,0
-2020-03-03,43,4,0,0
-2020-03-04,46,4,0,0
-2020-03-05,54,4,0,0
-2020-03-06,59,10,0,0
-2020-03-07,44,25,0,0
-2020-03-08,44,26,0,0
-2020-03-10,42,28,0,0
-2020-03-11,47,32,0,0
-2020-03-12,73,34,0,0
-2020-03-13,77,34,2,0
-2020-03-14,85,39,4,0
-2020-03-15,102,41,6,0
-2020-03-16,109,44,7,0
-2020-03-17,220,55,7,0
-2020-03-18,346,47,10,0
diff --git a/data/csv/by_uf/SE.csv b/data/csv/by_uf/SE.csv
deleted file mode 100644
index 76d9a22f..00000000
--- a/data/csv/by_uf/SE.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-03-02,1,0,0,0
-2020-03-03,1,0,0,0
-2020-03-04,1,0,0,0
-2020-03-05,2,0,0,0
-2020-03-06,3,1,0,0
-2020-03-07,1,1,0,0
-2020-03-08,1,1,0,0
-2020-03-10,2,3,0,0
-2020-03-11,2,3,0,0
-2020-03-12,2,3,0,0
-2020-03-13,2,3,0,0
-2020-03-14,4,3,0,0
-2020-03-15,1,11,1,0
-2020-03-16,1,11,1,0
-2020-03-17,7,12,4,0
-2020-03-18,15,11,5,0
diff --git a/data/csv/by_uf/SP.csv b/data/csv/by_uf/SP.csv
deleted file mode 100644
index 2ec3f525..00000000
--- a/data/csv/by_uf/SP.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-01-30,3,1,0,0
-2020-01-31,7,2,0,0
-2020-02-01,8,2,0,0
-2020-02-02,8,2,0,0
-2020-02-03,7,3,0,0
-2020-02-04,6,5,0,0
-2020-02-05,4,9,0,0
-2020-02-06,3,10,0,0
-2020-02-06,3,10,0,0
-2020-02-07,3,11,0,0
-2020-02-08,2,13,0,0
-2020-02-09,3,13,0,0
-2020-02-10,3,13,0,0
-2020-02-11,3,14,0,0
-2020-02-12,6,14,0,0
-2020-02-13,3,17,0,0
-2020-02-14,1,20,0,0
-2020-02-15,2,20,0,0
-2020-02-16,2,20,0,0
-2020-02-17,2,20,0,0
-2020-02-18,4,20,0,0
-2020-02-19,1,23,0,0
-2020-02-20,1,24,0,0
-2020-02-21,0,25,0,0
-2020-02-22,0,25,0,0
-2020-02-23,1,25,0,0
-2020-02-24,3,26,0,0
-2020-02-25,4,26,0,0
-2020-02-25,4,26,0,0
-2020-02-26,11,28,1,0
-2020-02-27,55,28,1,0
-2020-02-28,66,30,1,0
-2020-02-29,91,38,2,0
-2020-03-01,136,48,2,0
-2020-03-02,163,48,2,0
-2020-03-03,130,104,2,0
-2020-03-04,135,131,3,0
-2020-03-05,182,159,6,0
-2020-03-06,222,189,10,0
-2020-03-07,184,246,13,0
-2020-03-08,176,258,16,0
-2020-03-10,302,289,19,0
-2020-03-11,263,320,30,0
-2020-03-12,704,471,42,0
-2020-03-13,753,529,56,0
-2020-03-14,752,545,65,0
-2020-03-15,1125,551,136,0
-2020-03-16,1177,623,152,0
-2020-03-17,5047,709,164,1
-2020-03-18,5334,596,240,4
diff --git a/data/csv/by_uf/TO.csv b/data/csv/by_uf/TO.csv
deleted file mode 100644
index 7af59caf..00000000
--- a/data/csv/by_uf/TO.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-date,suspects,refuses,cases,deaths
-2020-03-13,2,0,0,0
-2020-03-14,2,0,0,0
-2020-03-15,3,0,0,0
-2020-03-16,3,0,0,0
-2020-03-17,11,0,0,0
-2020-03-18,13,0,0,0
diff --git a/data/csv/covid_19/by_city/by_city.csv b/data/csv/covid_19/by_city/by_city.csv
new file mode 100644
index 00000000..3821fb03
--- /dev/null
+++ b/data/csv/covid_19/by_city/by_city.csv
@@ -0,0 +1,451 @@
+date,uf,city,new_cases,cases
+2020-03-19,RS,Alvorada,1,1
+2020-03-16,GO,Anápolis,2,2
+2020-03-17,GO,Anápolis,0,2
+2020-03-18,GO,Anápolis,0,2
+2020-03-19,GO,Anápolis,0,2
+2020-03-18,GO,Aparecida de Goiânia,1,1
+2020-03-19,GO,Aparecida de Goiânia,0,1
+2020-03-16,CE,Aquiraz,1,1
+2020-03-17,CE,Aquiraz,0,1
+2020-03-18,CE,Aquiraz,0,1
+2020-03-19,CE,Aquiraz,0,1
+2020-03-14,SE,Aracaju,1,1
+2020-03-15,SE,Aracaju,0,1
+2020-03-16,SE,Aracaju,4,5
+2020-03-17,SE,Aracaju,0,5
+2020-03-18,SE,Aracaju,0,5
+2020-03-19,SE,Aracaju,0,5
+2020-03-19,RS,Bagé,2,2
+2020-03-18,SC,Balneário Camboriú,2,2
+2020-03-19,SC,Balneário Camboriú,2,4
+2020-03-05,RJ,Barra Mansa,1,1
+2020-03-06,RJ,Barra Mansa,0,1
+2020-03-07,RJ,Barra Mansa,0,1
+2020-03-08,RJ,Barra Mansa,0,1
+2020-03-09,RJ,Barra Mansa,0,1
+2020-03-10,RJ,Barra Mansa,0,1
+2020-03-11,RJ,Barra Mansa,0,1
+2020-03-12,RJ,Barra Mansa,0,1
+2020-03-13,RJ,Barra Mansa,0,1
+2020-03-14,RJ,Barra Mansa,0,1
+2020-03-15,RJ,Barra Mansa,0,1
+2020-03-16,RJ,Barra Mansa,0,1
+2020-03-17,RJ,Barra Mansa,0,1
+2020-03-18,RJ,Barra Mansa,0,1
+2020-03-19,RJ,Barra Mansa,0,1
+2020-03-18,SP,Barueri,1,1
+2020-03-19,SP,Barueri,0,1
+2020-03-16,MG,Belo Horizonte,1,1
+2020-03-17,MG,Belo Horizonte,4,5
+2020-03-18,MG,Belo Horizonte,5,10
+2020-03-19,MG,Belo Horizonte,8,18
+2020-03-16,PE,Belo Jardim,1,1
+2020-03-17,PE,Belo Jardim,0,1
+2020-03-18,PE,Belo Jardim,0,1
+2020-03-19,PE,Belo Jardim,0,1
+2020-03-18,PA,Belém,1,1
+2020-03-19,PA,Belém,0,1
+2020-03-07,DF,Brasília,1,1
+2020-03-08,DF,Brasília,0,1
+2020-03-09,DF,Brasília,0,1
+2020-03-10,DF,Brasília,1,2
+2020-03-11,DF,Brasília,0,2
+2020-03-12,DF,Brasília,1,3
+2020-03-13,DF,Brasília,0,3
+2020-03-14,DF,Brasília,5,8
+2020-03-15,DF,Brasília,6,14
+2020-03-16,DF,Brasília,5,19
+2020-03-17,DF,Brasília,7,26
+2020-03-18,DF,Brasília,10,36
+2020-03-19,DF,Brasília,48,84
+2020-03-15,SC,Braço do Norte,1,1
+2020-03-16,SC,Braço do Norte,0,1
+2020-03-17,SC,Braço do Norte,0,1
+2020-03-18,SC,Braço do Norte,1,2
+2020-03-19,SC,Braço do Norte,2,4
+2020-03-18,SP,Campinas,1,1
+2020-03-19,SP,Campinas,0,1
+2020-03-10,RS,Campo Bom,1,1
+2020-03-11,RS,Campo Bom,0,1
+2020-03-12,RS,Campo Bom,0,1
+2020-03-13,RS,Campo Bom,0,1
+2020-03-14,RS,Campo Bom,0,1
+2020-03-15,RS,Campo Bom,0,1
+2020-03-16,RS,Campo Bom,0,1
+2020-03-17,RS,Campo Bom,0,1
+2020-03-18,RS,Campo Bom,1,2
+2020-03-19,RS,Campo Bom,0,2
+2020-03-14,MS,Campo Grande,2,2
+2020-03-15,MS,Campo Grande,0,2
+2020-03-16,MS,Campo Grande,2,4
+2020-03-17,MS,Campo Grande,2,6
+2020-03-18,MS,Campo Grande,1,7
+2020-03-19,MS,Campo Grande,1,8
+2020-03-17,PR,Campo Largo,1,1
+2020-03-18,PR,Campo Largo,0,1
+2020-03-19,PR,Campo Largo,0,1
+2020-03-14,SP,Carapicuíba,1,1
+2020-03-15,SP,Carapicuíba,0,1
+2020-03-16,SP,Carapicuíba,0,1
+2020-03-17,SP,Carapicuíba,0,1
+2020-03-18,SP,Carapicuíba,0,1
+2020-03-19,SP,Carapicuíba,0,1
+2020-03-12,RS,Caxias do Sul,1,1
+2020-03-13,RS,Caxias do Sul,0,1
+2020-03-14,RS,Caxias do Sul,0,1
+2020-03-15,RS,Caxias do Sul,0,1
+2020-03-16,RS,Caxias do Sul,1,2
+2020-03-17,RS,Caxias do Sul,0,2
+2020-03-18,RS,Caxias do Sul,0,2
+2020-03-19,RS,Caxias do Sul,0,2
+2020-03-12,PR,Cianorte,1,1
+2020-03-13,PR,Cianorte,0,1
+2020-03-14,PR,Cianorte,0,1
+2020-03-15,PR,Cianorte,0,1
+2020-03-16,PR,Cianorte,0,1
+2020-03-17,PR,Cianorte,1,2
+2020-03-18,PR,Cianorte,0,2
+2020-03-19,PR,Cianorte,0,2
+2020-03-16,MG,Coronel Fabriciano,1,1
+2020-03-17,MG,Coronel Fabriciano,0,1
+2020-03-18,MG,Coronel Fabriciano,0,1
+2020-03-19,MG,Coronel Fabriciano,0,1
+2020-03-18,SP,Cotia,1,1
+2020-03-19,SP,Cotia,0,1
+2020-03-12,PR,Curitiba,5,5
+2020-03-13,PR,Curitiba,0,5
+2020-03-14,PR,Curitiba,0,5
+2020-03-15,PR,Curitiba,0,5
+2020-03-16,PR,Curitiba,2,7
+2020-03-17,PR,Curitiba,0,7
+2020-03-18,PR,Curitiba,0,7
+2020-03-19,PR,Curitiba,9,16
+2020-03-08,MG,Divinópolis,1,1
+2020-03-09,MG,Divinópolis,0,1
+2020-03-10,MG,Divinópolis,0,1
+2020-03-11,MG,Divinópolis,0,1
+2020-03-12,MG,Divinópolis,0,1
+2020-03-13,MG,Divinópolis,0,1
+2020-03-14,MG,Divinópolis,0,1
+2020-03-15,MG,Divinópolis,0,1
+2020-03-16,MG,Divinópolis,0,1
+2020-03-17,MG,Divinópolis,0,1
+2020-03-18,MG,Divinópolis,0,1
+2020-03-19,MG,Divinópolis,0,1
+2020-03-19,RS,Erechim,2,2
+2020-03-18,RS,Farroupilha,1,1
+2020-03-19,RS,Farroupilha,0,1
+2020-03-06,BA,Feira de Santana,1,1
+2020-03-07,BA,Feira de Santana,1,2
+2020-03-08,BA,Feira de Santana,0,2
+2020-03-09,BA,Feira de Santana,0,2
+2020-03-10,BA,Feira de Santana,0,2
+2020-03-11,BA,Feira de Santana,1,3
+2020-03-12,BA,Feira de Santana,0,3
+2020-03-13,BA,Feira de Santana,1,4
+2020-03-14,BA,Feira de Santana,0,4
+2020-03-15,BA,Feira de Santana,1,5
+2020-03-16,BA,Feira de Santana,0,5
+2020-03-17,BA,Feira de Santana,0,5
+2020-03-18,BA,Feira de Santana,0,5
+2020-03-19,BA,Feira de Santana,0,5
+2020-03-12,SP,Ferraz de Vasconcelos,1,1
+2020-03-13,SP,Ferraz de Vasconcelos,0,1
+2020-03-14,SP,Ferraz de Vasconcelos,0,1
+2020-03-15,SP,Ferraz de Vasconcelos,0,1
+2020-03-16,SP,Ferraz de Vasconcelos,0,1
+2020-03-17,SP,Ferraz de Vasconcelos,0,1
+2020-03-18,SP,Ferraz de Vasconcelos,0,1
+2020-03-19,SP,Ferraz de Vasconcelos,0,1
+2020-03-12,SC,Florianópolis,2,2
+2020-03-13,SC,Florianópolis,0,2
+2020-03-14,SC,Florianópolis,0,2
+2020-03-15,SC,Florianópolis,0,2
+2020-03-16,SC,Florianópolis,1,3
+2020-03-17,SC,Florianópolis,0,3
+2020-03-18,SC,Florianópolis,2,5
+2020-03-19,SC,Florianópolis,1,6
+2020-03-15,CE,Fortaleza,3,3
+2020-03-16,CE,Fortaleza,5,8
+2020-03-17,CE,Fortaleza,2,10
+2020-03-18,CE,Fortaleza,8,18
+2020-03-19,CE,Fortaleza,4,22
+2020-03-18,PR,Foz do Iguaçu,1,1
+2020-03-19,PR,Foz do Iguaçu,0,1
+2020-03-12,GO,Goiânia,2,2
+2020-03-13,GO,Goiânia,0,2
+2020-03-14,GO,Goiânia,1,3
+2020-03-15,GO,Goiânia,0,3
+2020-03-16,GO,Goiânia,2,5
+2020-03-17,GO,Goiânia,0,5
+2020-03-18,GO,Goiânia,0,5
+2020-03-19,GO,Goiânia,2,7
+2020-03-18,RJ,Guapimirim,1,1
+2020-03-19,RJ,Guapimirim,0,1
+2020-03-18,SP,Guarulhos,1,1
+2020-03-19,SP,Guarulhos,0,1
+2020-03-12,MG,Ipatinga,1,1
+2020-03-13,MG,Ipatinga,0,1
+2020-03-14,MG,Ipatinga,0,1
+2020-03-15,MG,Ipatinga,0,1
+2020-03-16,MG,Ipatinga,0,1
+2020-03-17,MG,Ipatinga,0,1
+2020-03-18,MG,Ipatinga,0,1
+2020-03-19,MG,Ipatinga,0,1
+2020-03-19,BA,Itabuna,1,1
+2020-03-16,PE,Jaboatão dos Guararapes,1,1
+2020-03-17,PE,Jaboatão dos Guararapes,0,1
+2020-03-18,PE,Jaboatão dos Guararapes,0,1
+2020-03-19,PE,Jaboatão dos Guararapes,0,1
+2020-03-18,SP,Jaguariúna,1,1
+2020-03-19,SP,Jaguariúna,0,1
+2020-03-18,GO,Jataí,1,1
+2020-03-19,GO,Jataí,0,1
+2020-03-19,RO,Ji-Paraná,1,1
+2020-03-13,SC,Joinville,1,1
+2020-03-14,SC,Joinville,0,1
+2020-03-15,SC,Joinville,0,1
+2020-03-16,SC,Joinville,0,1
+2020-03-17,SC,Joinville,0,1
+2020-03-18,SC,Joinville,0,1
+2020-03-19,SC,Joinville,1,2
+2020-03-18,PB,João Pessoa,1,1
+2020-03-19,PB,João Pessoa,0,1
+2020-03-19,CE,Juazeiro do Norte,1,1
+2020-03-14,MG,Juiz de Fora,1,1
+2020-03-15,MG,Juiz de Fora,0,1
+2020-03-16,MG,Juiz de Fora,1,2
+2020-03-17,MG,Juiz de Fora,0,2
+2020-03-18,MG,Juiz de Fora,0,2
+2020-03-19,MG,Juiz de Fora,0,2
+2020-03-18,SP,Jundiaí,1,1
+2020-03-19,SP,Jundiaí,0,1
+2020-03-19,BA,Lauro de Freitas,2,2
+2020-03-14,ES,Linhares,1,1
+2020-03-15,ES,Linhares,0,1
+2020-03-16,ES,Linhares,0,1
+2020-03-17,ES,Linhares,0,1
+2020-03-18,ES,Linhares,0,1
+2020-03-19,ES,Linhares,0,1
+2020-03-17,PR,Londrina,1,1
+2020-03-18,PR,Londrina,0,1
+2020-03-19,PR,Londrina,0,1
+2020-03-08,AL,Maceió,1,1
+2020-03-09,AL,Maceió,0,1
+2020-03-10,AL,Maceió,0,1
+2020-03-11,AL,Maceió,0,1
+2020-03-12,AL,Maceió,0,1
+2020-03-13,AL,Maceió,0,1
+2020-03-14,AL,Maceió,0,1
+2020-03-15,AL,Maceió,0,1
+2020-03-16,AL,Maceió,0,1
+2020-03-17,AL,Maceió,0,1
+2020-03-18,AL,Maceió,0,1
+2020-03-19,AL,Maceió,3,4
+2020-03-13,AM,Manaus,1,1
+2020-03-14,AM,Manaus,0,1
+2020-03-15,AM,Manaus,0,1
+2020-03-16,AM,Manaus,0,1
+2020-03-17,AM,Manaus,1,2
+2020-03-18,AM,Manaus,0,2
+2020-03-19,AM,Manaus,1,3
+2020-03-18,PR,Maringá,1,1
+2020-03-19,PR,Maringá,0,1
+2020-03-16,SP,Mauá,1,1
+2020-03-17,SP,Mauá,0,1
+2020-03-18,SP,Mauá,0,1
+2020-03-19,SP,Mauá,0,1
+2020-03-19,RJ,Miguel Pereira,1,1
+2020-03-19,PE,NO-INFO,6,6
+2020-03-19,SP,NO-INFO,1,1
+2020-03-19,GO,NO-INFO,1,1
+2020-03-12,RN,Natal,1,1
+2020-03-13,RN,Natal,0,1
+2020-03-14,RN,Natal,0,1
+2020-03-15,RN,Natal,0,1
+2020-03-16,RN,Natal,0,1
+2020-03-17,RN,Natal,0,1
+2020-03-18,RN,Natal,0,1
+2020-03-19,RN,Natal,0,1
+2020-03-09,RJ,Niterói,1,1
+2020-03-10,RJ,Niterói,0,1
+2020-03-11,RJ,Niterói,0,1
+2020-03-12,RJ,Niterói,0,1
+2020-03-13,RJ,Niterói,0,1
+2020-03-14,RJ,Niterói,0,1
+2020-03-15,RJ,Niterói,0,1
+2020-03-16,RJ,Niterói,0,1
+2020-03-17,RJ,Niterói,5,6
+2020-03-18,RJ,Niterói,0,6
+2020-03-19,RJ,Niterói,1,7
+2020-03-17,MG,Nova Lima,1,1
+2020-03-18,MG,Nova Lima,0,1
+2020-03-19,MG,Nova Lima,1,2
+2020-03-18,SP,Osasco,1,1
+2020-03-19,SP,Osasco,0,1
+2020-03-18,TO,Palmas,1,1
+2020-03-19,TO,Palmas,0,1
+2020-03-14,MG,Patrocínio,1,1
+2020-03-15,MG,Patrocínio,0,1
+2020-03-16,MG,Patrocínio,0,1
+2020-03-17,MG,Patrocínio,0,1
+2020-03-18,MG,Patrocínio,0,1
+2020-03-19,MG,Patrocínio,0,1
+2020-03-17,PR,Pinhais,1,1
+2020-03-18,PR,Pinhais,0,1
+2020-03-19,PR,Pinhais,0,1
+2020-03-11,RS,Porto Alegre,1,1
+2020-03-12,RS,Porto Alegre,1,2
+2020-03-13,RS,Porto Alegre,2,4
+2020-03-14,RS,Porto Alegre,1,5
+2020-03-15,RS,Porto Alegre,0,5
+2020-03-16,RS,Porto Alegre,3,8
+2020-03-17,RS,Porto Alegre,8,16
+2020-03-18,RS,Porto Alegre,5,21
+2020-03-19,RS,Porto Alegre,2,23
+2020-03-16,BA,Porto Seguro,1,1
+2020-03-17,BA,Porto Seguro,2,3
+2020-03-18,BA,Porto Seguro,1,4
+2020-03-19,BA,Porto Seguro,0,4
+2020-03-17,BA,Prado,1,1
+2020-03-18,BA,Prado,0,1
+2020-03-19,BA,Prado,0,1
+2020-03-18,SE,Propriá,1,1
+2020-03-19,SE,Propriá,0,1
+2020-03-14,SC,Rancho Queimado,2,2
+2020-03-15,SC,Rancho Queimado,0,2
+2020-03-16,SC,Rancho Queimado,0,2
+2020-03-17,SC,Rancho Queimado,0,2
+2020-03-18,SC,Rancho Queimado,0,2
+2020-03-19,SC,Rancho Queimado,0,2
+2020-03-12,PE,Recife,2,2
+2020-03-13,PE,Recife,0,2
+2020-03-14,PE,Recife,5,7
+2020-03-15,PE,Recife,1,8
+2020-03-16,PE,Recife,8,16
+2020-03-17,PE,Recife,1,17
+2020-03-18,PE,Recife,3,20
+2020-03-19,PE,Recife,0,20
+2020-03-17,AC,Rio Branco,3,3
+2020-03-18,AC,Rio Branco,0,3
+2020-03-19,AC,Rio Branco,1,4
+2020-03-12,GO,Rio Verde,1,1
+2020-03-13,GO,Rio Verde,0,1
+2020-03-14,GO,Rio Verde,0,1
+2020-03-15,GO,Rio Verde,0,1
+2020-03-16,GO,Rio Verde,1,2
+2020-03-17,GO,Rio Verde,1,3
+2020-03-18,GO,Rio Verde,0,3
+2020-03-19,GO,Rio Verde,0,3
+2020-03-07,RJ,Rio de Janeiro,1,1
+2020-03-08,RJ,Rio de Janeiro,1,2
+2020-03-09,RJ,Rio de Janeiro,4,6
+2020-03-10,RJ,Rio de Janeiro,0,6
+2020-03-11,RJ,Rio de Janeiro,6,12
+2020-03-12,RJ,Rio de Janeiro,2,14
+2020-03-13,RJ,Rio de Janeiro,3,17
+2020-03-14,RJ,Rio de Janeiro,5,22
+2020-03-15,RJ,Rio de Janeiro,0,22
+2020-03-16,RJ,Rio de Janeiro,7,29
+2020-03-17,RJ,Rio de Janeiro,3,32
+2020-03-18,RJ,Rio de Janeiro,23,55
+2020-03-19,RJ,Rio de Janeiro,1,56
+2020-03-17,MT,Rondonópolis,1,1
+2020-03-18,MT,Rondonópolis,0,1
+2020-03-19,MT,Rondonópolis,0,1
+2020-03-13,BA,Salvador,3,3
+2020-03-14,BA,Salvador,0,3
+2020-03-15,BA,Salvador,1,4
+2020-03-16,BA,Salvador,0,4
+2020-03-17,BA,Salvador,3,7
+2020-03-18,BA,Salvador,10,17
+2020-03-19,BA,Salvador,1,18
+2020-03-08,SP,Santana de Parnaíba,1,1
+2020-03-09,SP,Santana de Parnaíba,0,1
+2020-03-10,SP,Santana de Parnaíba,0,1
+2020-03-11,SP,Santana de Parnaíba,0,1
+2020-03-12,SP,Santana de Parnaíba,0,1
+2020-03-13,SP,Santana de Parnaíba,0,1
+2020-03-14,SP,Santana de Parnaíba,0,1
+2020-03-15,SP,Santana de Parnaíba,0,1
+2020-03-16,SP,Santana de Parnaíba,0,1
+2020-03-17,SP,Santana de Parnaíba,0,1
+2020-03-18,SP,Santana de Parnaíba,0,1
+2020-03-19,SP,Santana de Parnaíba,0,1
+2020-03-19,RS,Santana do Livramento,1,1
+2020-03-17,SP,Santo André,1,1
+2020-03-18,SP,Santo André,5,6
+2020-03-19,SP,Santo André,0,6
+2020-03-18,RS,Serafina Corrêa,1,1
+2020-03-19,RS,Serafina Corrêa,1,2
+2020-03-17,MG,Sete Lagoas,1,1
+2020-03-18,MG,Sete Lagoas,0,1
+2020-03-19,MG,Sete Lagoas,0,1
+2020-03-19,MS,Sidrolândia,1,1
+2020-03-18,CE,Sobral,1,1
+2020-03-19,CE,Sobral,0,1
+2020-03-15,SP,São Bernardo do Campo,1,1
+2020-03-16,SP,São Bernardo do Campo,1,2
+2020-03-17,SP,São Bernardo do Campo,0,2
+2020-03-18,SP,São Bernardo do Campo,1,3
+2020-03-19,SP,São Bernardo do Campo,0,3
+2020-03-15,SP,São Caetano do Sul,1,1
+2020-03-16,SP,São Caetano do Sul,0,1
+2020-03-17,SP,São Caetano do Sul,0,1
+2020-03-18,SP,São Caetano do Sul,5,6
+2020-03-19,SP,São Caetano do Sul,0,6
+2020-03-19,SC,São José,1,1
+2020-03-18,SP,São José do Rio Preto,1,1
+2020-03-19,SP,São José do Rio Preto,0,1
+2020-03-18,SP,São José dos Campos,1,1
+2020-03-19,SP,São José dos Campos,0,1
+2020-02-25,SP,São Paulo,1,1
+2020-02-29,SP,São Paulo,1,2
+2020-03-04,SP,São Paulo,1,3
+2020-03-05,SP,São Paulo,3,6
+2020-03-06,SP,São Paulo,4,10
+2020-03-07,SP,São Paulo,3,13
+2020-03-08,SP,São Paulo,2,15
+2020-03-09,SP,São Paulo,0,15
+2020-03-10,SP,São Paulo,3,18
+2020-03-11,SP,São Paulo,26,44
+2020-03-12,SP,São Paulo,18,62
+2020-03-13,SP,São Paulo,0,62
+2020-03-14,SP,São Paulo,0,62
+2020-03-15,SP,São Paulo,69,131
+2020-03-16,SP,São Paulo,14,145
+2020-03-17,SP,São Paulo,11,156
+2020-03-18,SP,São Paulo,60,216
+2020-03-19,SP,São Paulo,46,262
+2020-03-19,PI,Teresina,3,3
+2020-03-18,RS,Torres,1,1
+2020-03-19,RS,Torres,0,1
+2020-03-18,SC,Tubarão,2,2
+2020-03-19,SC,Tubarão,0,2
+2020-03-18,MG,Uberaba,1,1
+2020-03-19,MG,Uberaba,0,1
+2020-03-17,MG,Uberlândia,1,1
+2020-03-18,MG,Uberlândia,0,1
+2020-03-19,MG,Uberlândia,0,1
+2020-03-05,ES,Vila Velha,1,1
+2020-03-06,ES,Vila Velha,0,1
+2020-03-07,ES,Vila Velha,0,1
+2020-03-08,ES,Vila Velha,0,1
+2020-03-09,ES,Vila Velha,0,1
+2020-03-10,ES,Vila Velha,0,1
+2020-03-11,ES,Vila Velha,0,1
+2020-03-12,ES,Vila Velha,1,2
+2020-03-13,ES,Vila Velha,0,2
+2020-03-14,ES,Vila Velha,0,2
+2020-03-15,ES,Vila Velha,0,2
+2020-03-16,ES,Vila Velha,4,6
+2020-03-17,ES,Vila Velha,0,6
+2020-03-18,ES,Vila Velha,1,7
+2020-03-19,ES,Vila Velha,0,7
+2020-03-14,ES,Vitória,1,1
+2020-03-15,ES,Vitória,0,1
+2020-03-16,ES,Vitória,0,1
+2020-03-17,ES,Vitória,0,1
+2020-03-18,ES,Vitória,2,3
+2020-03-19,ES,Vitória,2,5
diff --git a/data/csv/covid_19/by_uf/by_uf.csv b/data/csv/covid_19/by_uf/by_uf.csv
new file mode 100644
index 00000000..fb758dfd
--- /dev/null
+++ b/data/csv/covid_19/by_uf/by_uf.csv
@@ -0,0 +1,188 @@
+date,uf,new_cases,cases
+2020-02-25,SP,1,1
+2020-02-29,SP,1,2
+2020-03-04,SP,1,3
+2020-03-05,ES,1,1
+2020-03-05,RJ,1,1
+2020-03-05,SP,3,6
+2020-03-06,BA,1,1
+2020-03-06,ES,0,1
+2020-03-06,RJ,0,1
+2020-03-06,SP,4,10
+2020-03-07,BA,1,2
+2020-03-07,DF,1,1
+2020-03-07,ES,0,1
+2020-03-07,RJ,1,2
+2020-03-07,SP,3,13
+2020-03-08,AL,1,1
+2020-03-08,BA,0,2
+2020-03-08,DF,0,1
+2020-03-08,ES,0,1
+2020-03-08,MG,1,1
+2020-03-08,RJ,1,3
+2020-03-08,SP,3,16
+2020-03-09,AL,0,1
+2020-03-09,BA,0,2
+2020-03-09,DF,0,1
+2020-03-09,ES,0,1
+2020-03-09,MG,0,1
+2020-03-09,RJ,5,8
+2020-03-09,SP,0,16
+2020-03-10,AL,0,1
+2020-03-10,BA,0,2
+2020-03-10,DF,1,2
+2020-03-10,ES,0,1
+2020-03-10,MG,0,1
+2020-03-10,RJ,0,8
+2020-03-10,RS,1,1
+2020-03-10,SP,3,19
+2020-03-11,AL,0,1
+2020-03-11,BA,1,3
+2020-03-11,DF,0,2
+2020-03-11,ES,0,1
+2020-03-11,MG,0,1
+2020-03-11,RJ,6,14
+2020-03-11,RS,1,2
+2020-03-11,SP,26,45
+2020-03-12,AL,0,1
+2020-03-12,BA,0,3
+2020-03-12,DF,1,3
+2020-03-12,ES,1,2
+2020-03-12,GO,3,3
+2020-03-12,MG,1,2
+2020-03-12,PE,2,2
+2020-03-12,PR,6,6
+2020-03-12,RJ,2,16
+2020-03-12,RN,1,1
+2020-03-12,RS,2,4
+2020-03-12,SC,2,2
+2020-03-12,SP,19,64
+2020-03-13,AL,0,1
+2020-03-13,AM,1,1
+2020-03-13,BA,4,7
+2020-03-13,DF,0,3
+2020-03-13,ES,0,2
+2020-03-13,GO,0,3
+2020-03-13,MG,0,2
+2020-03-13,PE,0,2
+2020-03-13,PR,0,6
+2020-03-13,RJ,3,19
+2020-03-13,RN,0,1
+2020-03-13,RS,2,6
+2020-03-13,SC,1,3
+2020-03-13,SP,0,64
+2020-03-14,AL,0,1
+2020-03-14,AM,0,1
+2020-03-14,BA,0,7
+2020-03-14,DF,5,8
+2020-03-14,ES,2,4
+2020-03-14,GO,1,4
+2020-03-14,MG,2,4
+2020-03-14,MS,2,2
+2020-03-14,PE,5,7
+2020-03-14,PR,0,6
+2020-03-14,RJ,5,24
+2020-03-14,RN,0,1
+2020-03-14,RS,1,7
+2020-03-14,SC,2,5
+2020-03-14,SE,1,1
+2020-03-14,SP,1,65
+2020-03-15,AL,0,1
+2020-03-15,AM,0,1
+2020-03-15,BA,2,9
+2020-03-15,CE,3,3
+2020-03-15,DF,6,14
+2020-03-15,ES,0,4
+2020-03-15,GO,0,4
+2020-03-15,MG,0,4
+2020-03-15,MS,0,2
+2020-03-15,PE,1,8
+2020-03-15,PR,0,6
+2020-03-15,RJ,0,24
+2020-03-15,RN,0,1
+2020-03-15,RS,0,7
+2020-03-15,SC,1,6
+2020-03-15,SE,0,1
+2020-03-15,SP,71,136
+2020-03-16,AL,0,1
+2020-03-16,AM,0,1
+2020-03-16,BA,1,10
+2020-03-16,CE,6,9
+2020-03-16,DF,5,19
+2020-03-16,ES,4,8
+2020-03-16,GO,5,9
+2020-03-16,MG,3,7
+2020-03-16,MS,2,4
+2020-03-16,PE,10,18
+2020-03-16,PR,2,8
+2020-03-16,RJ,7,31
+2020-03-16,RN,0,1
+2020-03-16,RS,4,11
+2020-03-16,SC,1,7
+2020-03-16,SE,4,5
+2020-03-16,SP,16,152
+2020-03-17,AC,3,3
+2020-03-17,AL,0,1
+2020-03-17,AM,1,2
+2020-03-17,BA,6,16
+2020-03-17,CE,2,11
+2020-03-17,DF,7,26
+2020-03-17,ES,0,8
+2020-03-17,GO,1,10
+2020-03-17,MG,7,14
+2020-03-17,MS,2,6
+2020-03-17,MT,1,1
+2020-03-17,PE,1,19
+2020-03-17,PR,4,12
+2020-03-17,RJ,8,39
+2020-03-17,RN,0,1
+2020-03-17,RS,8,19
+2020-03-17,SC,0,7
+2020-03-17,SE,0,5
+2020-03-17,SP,12,164
+2020-03-18,AC,0,3
+2020-03-18,AL,0,1
+2020-03-18,AM,0,2
+2020-03-18,BA,11,27
+2020-03-18,CE,9,20
+2020-03-18,DF,10,36
+2020-03-18,ES,3,11
+2020-03-18,GO,2,12
+2020-03-18,MG,6,20
+2020-03-18,MS,1,7
+2020-03-18,MT,0,1
+2020-03-18,PA,1,1
+2020-03-18,PB,1,1
+2020-03-18,PE,3,22
+2020-03-18,PR,2,14
+2020-03-18,RJ,24,63
+2020-03-18,RN,0,1
+2020-03-18,RS,9,28
+2020-03-18,SC,7,14
+2020-03-18,SE,1,6
+2020-03-18,SP,80,244
+2020-03-18,TO,1,1
+2020-03-19,AC,1,4
+2020-03-19,AL,3,4
+2020-03-19,AM,1,3
+2020-03-19,BA,4,31
+2020-03-19,CE,5,25
+2020-03-19,DF,48,84
+2020-03-19,ES,2,13
+2020-03-19,GO,3,15
+2020-03-19,MG,9,29
+2020-03-19,MS,2,9
+2020-03-19,MT,0,1
+2020-03-19,PA,0,1
+2020-03-19,PB,0,1
+2020-03-19,PE,6,28
+2020-03-19,PI,3,3
+2020-03-19,PR,9,23
+2020-03-19,RJ,3,66
+2020-03-19,RN,0,1
+2020-03-19,RO,1,1
+2020-03-19,RS,9,37
+2020-03-19,SC,7,21
+2020-03-19,SE,0,6
+2020-03-19,SP,47,291
+2020-03-19,TO,0,1
diff --git a/data/csv/city_population/city_population.csv b/data/csv/population/by_city/by_city.csv
similarity index 99%
rename from data/csv/city_population/city_population.csv
rename to data/csv/population/by_city/by_city.csv
index 3f400280..b694caed 100644
--- a/data/csv/city_population/city_population.csv
+++ b/data/csv/population/by_city/by_city.csv
@@ -1,4 +1,4 @@
-UF,city_name,estimated_population
+uf,city,estimated_population
 RO,Alta Floresta D'Oeste,22945
 RO,Ariquemes,107863
 RO,Cabixi,5312
diff --git a/data/csv/uf_population/uf_population.csv b/data/csv/population/by_uf/by_uf.csv
similarity index 92%
rename from data/csv/uf_population/uf_population.csv
rename to data/csv/population/by_uf/by_uf.csv
index db5e6509..afe8256c 100644
--- a/data/csv/uf_population/uf_population.csv
+++ b/data/csv/population/by_uf/by_uf.csv
@@ -1,4 +1,4 @@
-UF,estimated_population,city_name,capital_estimated_population
+uf,estimated_population,city,capital_estimated_population
 RO,1777225,Porto Velho,529544
 AC,881935,Rio Branco,407319
 AM,4144597,Manaus,2182763
diff --git a/data/data_params.py b/data/data_params.py
index 05e899cd..9259b239 100644
--- a/data/data_params.py
+++ b/data/data_params.py
@@ -1,62 +1,191 @@
 import pandas as pd
 import streamlit as st
 
-ufs = ['AC', 'AL', 'AM', 'AP', 'BA', 'CE',
-       'DF', 'ES', 'GO', 'MA', 'MG', 'MS',
-       'MT', 'PA', 'PB', 'PE', 'PI', 'PR',
-       'RJ', 'RN', 'RO', 'RR', 'RS', 'SC',
-       'SE', 'SP', 'TO']
+@st.cache
+def load_uf_pop_data():
+    return pd.read_csv(f'data/csv/population/by_uf/by_uf.csv')
 
 
 @st.cache
-def load_uf_pop_data():
-    return (pd.read_csv('data/csv/uf_population/uf_population.csv')
-              .set_index('UF'))
+def load_city_pop_data():
+    return pd.read_csv(f'data/csv/population/by_city/by_city.csv')
 
 
 @st.cache
 def load_uf_covid_data():
-    path = 'data/csv/by_uf/'
-    return {file.split('.')[0]: pd.read_csv(path+file+'.csv') for file in ufs}
+    return pd.read_csv(f'data/csv/covid_19/by_uf/by_uf.csv')
+
+
+@st.cache
+def load_city_covid_data():
+    return pd.read_csv(f'data/csv/covid_19/by_city/by_city.csv')
 
 
 @st.cache
 def query_ufs():
-    uf_covid_data = load_uf_covid_data()
-    valid_uf_list = [key for key in uf_covid_data.keys() if uf_covid_data[key]['cases'].sum() > 0]
-    valid_uf_list.insert(0, '(Selecione)')
-    return valid_uf_list
+    return list(load_uf_covid_data()['uf'].unique())
 
 
-def query_dates(uf):
+@st.cache
+def query_cities():
+    return list(load_city_covid_data()['city'].unique())
+
+def query_uf_city(granularity):
+    if granularity == 'Estado':
+        query = query_ufs()
+        query_index = query.index('SP')
+    elif granularity == 'Município':
+        query = query_cities()
+        query_index = query.index('São Paulo')
+    else:
+        query = ['(Selecione Unidade)']
+    return query, query_index
+
+
+def query_dates(value,
+                granularity):
     '''
-    Query dates with codiv-19 cases for a given uf
+    Query dates with codiv-19 cases for a given uf or city
     '''
-    if uf == '(Selecione)':
-        return ['(Selecione)'], 0
+    dates_list = []
+    if granularity == 'Estado':
+        dates_list = (load_uf_covid_data()
+                .query('uf == @value')
+                ['date']
+                .unique())
+    elif granularity == 'Município':
+        dates_list =  (load_city_covid_data()
+                .query('city == @value')
+                ['date']
+                .unique()) 
     else:
-        uf_covid_data = load_uf_covid_data()
-        dates_list =  uf_covid_data[uf].query('cases > 0')['date'].to_list()
-        return dates_list, len(dates_list)-1
+        dates_list = [f'(Selecione a data)']
+    return dates_list, len(dates_list)-1
+
+
+def query_N(value: 'query uf/city value',
+            granularity):
+    if granularity == 'Estado':
+        N = (load_uf_pop_data()
+             .query('uf == @value')
+             [['uf','estimated_population']]
+             .values[0][1])
+    elif granularity == 'Município':
+        N = (load_city_pop_data()
+            .query('city == @value')
+            [['city', 'estimated_population']]
+            .values[0][1])    
+    else: 
+        N = 13_000_000
+    return N
 
 
-def query_params(uf: 'query uf',
+def query_I0(value: 'query uf/city value',
+             date: 'query uf date',
+             granularity):
+    if granularity == 'Estado':
+        I0 = (load_uf_covid_data()
+              .query('uf == @value')
+              .query('date == @date')
+              [['uf', 'cases']]
+              .values
+              [0][1]
+             )
+    elif granularity == 'Município':
+        I0 = (load_city_covid_data()
+              .query('city == @value')
+              .query('date == @date')
+              [['city', 'cases']]
+              .values
+              [0][1]
+             )
+    else: 
+        I0 = 152
+    return int(I0)
+
+
+def estimate_R0(value: 'query uf/city value',
+             date: 'query uf date',
+             granularity):
+    '''
+    Considering: cases(t) = cases(t-1) + new_cases(t) - removed(t)
+    ∴
+    removed(t) = cases(t-1) + new_cases(t) - cases(t)
+    '''
+
+    if granularity == 'Estado':
+        R0 = (load_uf_covid_data()
+              .query('uf == @value')
+              .assign(cases_tminus_1=lambda df: df.cases.shift(1).fillna(0))
+              .assign(removed=lambda df: df.cases_tminus_1 + df.new_cases - df.cases)
+              .query('date == @date')
+              [['uf', 'removed']]
+              .values
+              [0][1]
+             )
+    elif granularity == 'Município':
+        R0 = (load_city_covid_data()
+              .query('city == @value')
+              .assign(cases_tminus_1=lambda df: df.cases.shift(1).fillna(0))
+              .assign(removed=lambda df: df.cases_tminus_1 + df.new_cases - df.cases)
+              .query('date == @date')
+              [['city', 'removed']]
+              .values
+              [0][1]
+             )
+    else: 
+        R0 = 1
+    return int(R0)
+
+
+def estimate_E0(value: 'query uf/city value',
+                date: 'query uf date',
+                granularity):
+    '''
+    Premises: Exposed(t)>=New_cases(t-avg_incubation_time)
+    uses the last valid E for dates which value is null
+    '''
+    avg_incubation_time = 5
+    
+    if granularity == 'Estado':
+        E0 = (load_uf_covid_data()
+              .query('uf == @value')
+              .assign(exposed=lambda df: df.cases
+                                           .shift(-avg_incubation_time)
+                                           .fillna(method='ffill')
+                                           .fillna(0))  
+              .query('date == @date')
+              [['uf', 'exposed']]
+              .values
+              [0][1]
+             )
+    elif granularity == 'Município':
+        E0 = (load_city_covid_data()
+              .query('city == @value')
+              .assign(exposed=lambda df: df.new_cases
+                                           .shift(-avg_incubation_time)
+                                           .fillna(method='ffill')
+                                           .fillna(0))  
+              .query('date == @date')
+              [['uf', 'exposed']]
+              .values
+              [0][1]
+             )
+    else: 
+        E0 = 152
+    return int(E0)      
+
+
+def query_params(value: 'query uf/city value',
                  date: 'query uf date',
-                 use_capital: True):
+                 granularity):
     '''
     Query N, I(0), E(0) and R(0) parameters based on historic data
     for a given uf and date
 
     '''
-    uf_pop_data = load_uf_pop_data()
-    uf_covid_data = load_uf_covid_data()
-
-    population_col = 'estimated_population'
-    if use_capital:
-        population_col = 'capital_estimated_population'
-
-    N = uf_pop_data.loc[uf][population_col]
-    I0 = uf_covid_data[uf].query('date == @date')['cases'].values[0]
-    E0 = I0 #temporary workaround
-    R0 = uf_covid_data[uf].query('date == @date')['deaths'].values[0]
-    return N, E0, I0, R0
\ No newline at end of file
+    N = query_N(value, granularity)
+    E0 = estimate_E0(value, date, granularity) # temporary workaround
+    I0 = query_I0(value, date, granularity)
+    R0 = estimate_R0(value, date, granularity)
+    return N, E0, I0, R0