diff --git a/table_definitions/diagnostico_matricula.json b/diagnostico_matricula.json
similarity index 100%
rename from table_definitions/diagnostico_matricula.json
rename to diagnostico_matricula.json
diff --git a/table_definitions/docente.json b/docente.json
similarity index 100%
rename from table_definitions/docente.json
rename to docente.json
diff --git a/table_definitions/docente_por_escola.json b/docente_por_escola.json
similarity index 100%
rename from table_definitions/docente_por_escola.json
rename to docente_por_escola.json
diff --git a/table_definitions/escola.json b/escola.json
similarity index 100%
rename from table_definitions/escola.json
rename to escola.json
diff --git a/table_definitions/ibge_pib.json b/ibge_pib.json
similarity index 100%
rename from table_definitions/ibge_pib.json
rename to ibge_pib.json
diff --git a/table_definitions/indicadores_financeiros.json b/indicadores_financeiros.json
similarity index 100%
rename from table_definitions/indicadores_financeiros.json
rename to indicadores_financeiros.json
diff --git a/table_definitions/indice_distribuicao_matriculas.json b/indice_distribuicao_matriculas.json
similarity index 100%
rename from table_definitions/indice_distribuicao_matriculas.json
rename to indice_distribuicao_matriculas.json
diff --git a/table_definitions/matricula.json b/matricula.json
similarity index 100%
rename from table_definitions/matricula.json
rename to matricula.json
diff --git a/table_definitions/matricula_dependencia_adm.json b/matricula_dependencia_adm.json
similarity index 100%
rename from table_definitions/matricula_dependencia_adm.json
rename to matricula_dependencia_adm.json
diff --git a/table_definitions/matricula_localizacao.json b/matricula_localizacao.json
similarity index 100%
rename from table_definitions/matricula_localizacao.json
rename to matricula_localizacao.json
diff --git a/table_definitions/pnad.json b/pnad.json
similarity index 100%
rename from table_definitions/pnad.json
rename to pnad.json
diff --git a/pnad_smppir.json b/pnad_smppir.json
deleted file mode 100644
index 659b18c21f43d9d57c9ee53603a924c1fb3fda61..0000000000000000000000000000000000000000
--- a/pnad_smppir.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "pairing_description": "Tabela do censo IBGE (PNAD)",
-    "data_source": "PNAD (arquivo Pessoas)/IBGE",
-    "pk": [],
-    "foreign_keys": [
-        {
-            "keys": ["estado_id"],
-            "reference_columns": ["id"],
-            "reference_table": "estado"
-        }
-    ]
-}
diff --git a/table_definitions/populacao_fora_da_escola.json b/populacao_fora_da_escola.json
similarity index 100%
rename from table_definitions/populacao_fora_da_escola.json
rename to populacao_fora_da_escola.json
diff --git a/table_definitions/projecao_matricula.json b/projecao_matricula.json
similarity index 100%
rename from table_definitions/projecao_matricula.json
rename to projecao_matricula.json
diff --git a/table_definitions/turma.json b/turma.json
similarity index 100%
rename from table_definitions/turma.json
rename to turma.json