From 5f56022109c9850a669cf96aa393dd49d18d566a Mon Sep 17 00:00:00 2001
From: Juan Pablo Vial <jpvialb@incoviba.cl>
Date: Tue, 26 Mar 2024 09:38:20 -0300
Subject: [PATCH] Restructura contabilidad

---
 app/common/Define/Contabilidad/Exporter.php   |  2 +-
 .../api/contabilidad/centros_costos.php       |  3 +-
 .../routes/api/contabilidad/nubox.php         |  3 +-
 .../routes/contabilidad/centros_costos.php    |  3 +-
 .../centros_costos/asignar.blade.php          | 34 +++++++++-------
 app/setup/setups/services.php                 | 22 +++++------
 .../Controller/API/Contabilidad/Cartolas.php  | 31 +++++++--------
 .../API/{ => Contabilidad}/CentrosCostos.php  | 19 ++++-----
 .../Controller/API/Contabilidad/Depositos.php | 24 ++++++------
 .../API/Contabilidad/Movimientos.php          | 12 +++---
 .../API/{ => Contabilidad}/Nubox.php          |  7 ++--
 app/src/Controller/CentrosCostos.php          | 32 ---------------
 app/src/Controller/Contabilidad.php           | 30 +++++++-------
 .../Controller/Contabilidad/CentrosCostos.php | 32 +++++++++++++++
 app/src/Controller/Ventas.php                 | 12 +++---
 app/src/Controller/Ventas/Creditos.php        |  6 +--
 app/src/Controller/Ventas/Cuotas.php          | 12 +++---
 app/src/Controller/Ventas/Escrituras.php      |  8 ++--
 app/src/Controller/Ventas/Pies.php            | 12 +++---
 app/src/Model/CategoriaCentro.php             |  5 ---
 app/src/Model/{ => Contabilidad}/Banco.php    |  2 +-
 app/src/Model/{ => Contabilidad}/Cartola.php  |  3 +-
 .../Model/Contabilidad/CategoriaCentro.php    |  7 ++++
 .../Model/{ => Contabilidad}/CentroCosto.php  |  3 +-
 app/src/Model/{ => Contabilidad}/Deposito.php |  3 +-
 .../Model/{ => Contabilidad}/Movimiento.php   |  3 +-
 app/src/Model/{ => Contabilidad}/Nubox.php    |  4 +-
 .../{ => Contabilidad}/PagoCentroCosto.php    |  3 +-
 app/src/Model/Contabilidad/TipoCentro.php     |  7 ++++
 app/src/Model/Inmobiliaria/Cuenta.php         |  2 +-
 app/src/Model/Movimiento/Detalle.php          |  4 +-
 app/src/Model/TipoCentro.php                  |  5 ---
 app/src/Model/Venta/Cuota.php                 |  2 +-
 app/src/Model/Venta/Pago.php                  |  2 +-
 .../Repository/{ => Contabilidad}/Banco.php   |  4 +-
 .../Repository/{ => Contabilidad}/Cartola.php | 14 +++----
 .../{ => Contabilidad}/CategoriaCentro.php    |  5 ++-
 .../{ => Contabilidad}/CentroCosto.php        | 14 +++----
 .../{ => Contabilidad}/Deposito.php           | 12 +++---
 .../{ => Contabilidad}/Movimiento.php         | 13 ++++---
 .../Repository/{ => Contabilidad}/Nubox.php   | 13 ++++---
 .../{ => Contabilidad}/PagoCentroCosto.php    | 10 ++---
 .../{ => Contabilidad}/TipoCentro.php         |  5 ++-
 app/src/Repository/Inmobiliaria.php           |  2 +-
 app/src/Repository/Inmobiliaria/Cuenta.php    | 11 +++---
 app/src/Repository/Movimiento/Detalle.php     |  4 +-
 app/src/Repository/Venta/Cuota.php            | 10 ++---
 app/src/Repository/Venta/Pago.php             |  6 +--
 .../Service/{ => Contabilidad}/Cartola.php    | 39 +++++++++----------
 .../{ => Contabilidad}/Cartola/BCI.php        |  6 +--
 .../{ => Contabilidad}/Cartola/Itau.php       |  6 +--
 .../{ => Contabilidad}/Cartola/Santander.php  |  7 ++--
 .../{ => Contabilidad}/Cartola/Security.php   |  8 ++--
 .../Service/Contabilidad/Exporter/Nubox.php   |  4 +-
 .../Contabilidad/Informe/Tesoreria.php        | 14 +++----
 .../Service/{ => Contabilidad}/Movimiento.php | 16 ++++----
 app/src/Service/Contabilidad/Nubox.php        | 20 +++++-----
 57 files changed, 311 insertions(+), 291 deletions(-)
 rename app/src/Controller/API/{ => Contabilidad}/CentrosCostos.php (68%)
 rename app/src/Controller/API/{ => Contabilidad}/Nubox.php (97%)
 delete mode 100644 app/src/Controller/CentrosCostos.php
 create mode 100644 app/src/Controller/Contabilidad/CentrosCostos.php
 delete mode 100644 app/src/Model/CategoriaCentro.php
 rename app/src/Model/{ => Contabilidad}/Banco.php (87%)
 rename app/src/Model/{ => Contabilidad}/Cartola.php (89%)
 create mode 100644 app/src/Model/Contabilidad/CategoriaCentro.php
 rename app/src/Model/{ => Contabilidad}/CentroCosto.php (89%)
 rename app/src/Model/{ => Contabilidad}/Deposito.php (92%)
 rename app/src/Model/{ => Contabilidad}/Movimiento.php (94%)
 rename app/src/Model/{ => Contabilidad}/Nubox.php (81%)
 rename app/src/Model/{ => Contabilidad}/PagoCentroCosto.php (84%)
 create mode 100644 app/src/Model/Contabilidad/TipoCentro.php
 delete mode 100644 app/src/Model/TipoCentro.php
 rename app/src/Repository/{ => Contabilidad}/Banco.php (86%)
 rename app/src/Repository/{ => Contabilidad}/Cartola.php (85%)
 rename app/src/Repository/{ => Contabilidad}/CategoriaCentro.php (71%)
 rename app/src/Repository/{ => Contabilidad}/CentroCosto.php (88%)
 rename app/src/Repository/{ => Contabilidad}/Deposito.php (87%)
 rename app/src/Repository/{ => Contabilidad}/Movimiento.php (85%)
 rename app/src/Repository/{ => Contabilidad}/Nubox.php (82%)
 rename app/src/Repository/{ => Contabilidad}/PagoCentroCosto.php (80%)
 rename app/src/Repository/{ => Contabilidad}/TipoCentro.php (71%)
 rename app/src/Service/{ => Contabilidad}/Cartola.php (83%)
 rename app/src/Service/{ => Contabilidad}/Cartola/BCI.php (98%)
 rename app/src/Service/{ => Contabilidad}/Cartola/Itau.php (99%)
 rename app/src/Service/{ => Contabilidad}/Cartola/Santander.php (98%)
 rename app/src/Service/{ => Contabilidad}/Cartola/Security.php (98%)
 rename app/src/Service/{ => Contabilidad}/Movimiento.php (69%)

diff --git a/app/common/Define/Contabilidad/Exporter.php b/app/common/Define/Contabilidad/Exporter.php
index 6af9f31..95eea73 100644
--- a/app/common/Define/Contabilidad/Exporter.php
+++ b/app/common/Define/Contabilidad/Exporter.php
@@ -6,5 +6,5 @@ use Incoviba\Model;
 
 interface Exporter
 {
-    public function export(Model\Inmobiliaria $inmobiliaria, Model\Banco $banco, DateTimeInterface $mes, array $movimientos): string;
+    public function export(Model\Inmobiliaria $inmobiliaria, Model\Contabilidad\Banco $banco, DateTimeInterface $mes, array $movimientos): string;
 }
diff --git a/app/resources/routes/api/contabilidad/centros_costos.php b/app/resources/routes/api/contabilidad/centros_costos.php
index 877052b..10fe34d 100644
--- a/app/resources/routes/api/contabilidad/centros_costos.php
+++ b/app/resources/routes/api/contabilidad/centros_costos.php
@@ -1,5 +1,6 @@
 <?php
-use Incoviba\Controller\API\CentrosCostos;
+
+use Incoviba\Controller\API\Contabilidad\CentrosCostos;
 
 $app->group('/centros_costos', function($app) {
     $app->post('/add[/]', [CentrosCostos::class, 'add']);
diff --git a/app/resources/routes/api/contabilidad/nubox.php b/app/resources/routes/api/contabilidad/nubox.php
index e1acbf9..354b437 100644
--- a/app/resources/routes/api/contabilidad/nubox.php
+++ b/app/resources/routes/api/contabilidad/nubox.php
@@ -1,5 +1,6 @@
 <?php
-use Incoviba\Controller\API\Nubox;
+
+use Incoviba\Controller\API\Contabilidad\Nubox;
 
 $app->group('/nubox/{inmobiliaria_rut}', function($app) {
     $app->get('/token[/]', [Nubox::class, 'token']);
diff --git a/app/resources/routes/contabilidad/centros_costos.php b/app/resources/routes/contabilidad/centros_costos.php
index d1089a4..510a7b5 100644
--- a/app/resources/routes/contabilidad/centros_costos.php
+++ b/app/resources/routes/contabilidad/centros_costos.php
@@ -1,5 +1,6 @@
 <?php
-use Incoviba\Controller\CentrosCostos;
+
+use Incoviba\Controller\Contabilidad\CentrosCostos;
 
 $app->group('/centros_costos', function($app) {
     $app->get('/asignar[/]', [CentrosCostos::class, 'asignar']);
diff --git a/app/resources/views/contabilidad/centros_costos/asignar.blade.php b/app/resources/views/contabilidad/centros_costos/asignar.blade.php
index 80fd04f..1dbfdff 100644
--- a/app/resources/views/contabilidad/centros_costos/asignar.blade.php
+++ b/app/resources/views/contabilidad/centros_costos/asignar.blade.php
@@ -14,9 +14,10 @@
                                 <i class="dropdown icon"></i>
                                 <div class="default text">Inmobiliaria</div>
                                 <div class="menu">
-                                @foreach ($inmobiliarias as $inmobiliaria)
-                                    <div class="item" data-value="{{$inmobiliaria->rut}}">{{$inmobiliaria->razon}}</div>
-                                @endforeach
+                                    @foreach ($inmobiliarias as $inmobiliaria)
+                                        <div class="item"
+                                             data-value="{{$inmobiliaria->rut}}">{{$inmobiliaria->razon}}</div>
+                                    @endforeach
                                 </div>
                             </div>
                         </div>
@@ -40,7 +41,7 @@
                         </div>
                         <div class="field">
                             <label for="file">Cartola</label>
-                            <input type="file" name="file" id="file" class="ui invisible file input" />
+                            <input type="file" name="file" id="file" class="ui invisible file input"/>
                             <label for="file" class="ui icon button">
                                 <i class="file icon"></i>
                                 Cargar
@@ -119,20 +120,20 @@
                 mes: '',
                 movimientos: [],
                 centrosCostos: {
-                    ingresos: JSON.parse('{!! json_encode(array_values(array_map(function(\Incoviba\Model\CentroCosto $centroCosto) {
+                    ingresos: JSON.parse('{!! json_encode(array_values(array_map(function(\Incoviba\Model\Contabilidad\CentroCosto $centroCosto) {
                             return [
                                 'id' => $centroCosto->id,
                                 'descripcion' => $centroCosto->descripcion
                             ];
-                        }, array_filter($centrosCostos, function(\Incoviba\Model\CentroCosto $centroCosto) {
+                        }, array_filter($centrosCostos, function(\Incoviba\Model\Contabilidad\CentroCosto $centroCosto) {
                             return $centroCosto->tipoCentro->descripcion === 'Ingreso';
                         })))) !!}'),
-                    egresos: JSON.parse('{!! json_encode(array_values(array_map(function(\Incoviba\Model\CentroCosto $centroCosto) {
+                    egresos: JSON.parse('{!! json_encode(array_values(array_map(function(\Incoviba\Model\Contabilidad\CentroCosto $centroCosto) {
                             return [
                                 'id' => $centroCosto->id,
                                 'descripcion' => $centroCosto->descripcion
                             ];
-                        }, array_filter($centrosCostos, function(\Incoviba\Model\CentroCosto $centroCosto) {
+                        }, array_filter($centrosCostos, function(\Incoviba\Model\Contabilidad\CentroCosto $centroCosto) {
                             return $centroCosto->tipoCentro->descripcion === 'Egreso';
                         })))) !!}'),
                 }
@@ -170,7 +171,11 @@
                                     return
                                 }
                                 $(this.ids.form.banco).dropdown('change values', json.cuentas.map(cuenta => {
-                                    return {value: cuenta.banco.id, text: cuenta.banco.nombre, name: cuenta.banco.nombre}
+                                    return {
+                                        value: cuenta.banco.id,
+                                        text: cuenta.banco.nombre,
+                                        name: cuenta.banco.nombre
+                                    }
                                 })).dropdown('refresh')
                             })
                         })
@@ -247,12 +252,12 @@
                         const movimientos = this.data.movimientos.map((movimiento, idx) => {
                             const temp = structuredClone(movimiento)
                             temp.fecha = movimiento.fecha.toISOString()
-                            let centro = $(".centro[data-index='" + (idx+1) + "']").dropdown('get value')
+                            let centro = $(".centro[data-index='" + (idx + 1) + "']").dropdown('get value')
                             if (centro.length === 0) {
                                 centro = ''
                             }
                             temp.centro_costo = centro
-                            let detalle = $("[name='detalle" + (idx+1) + "']").val()
+                            let detalle = $("[name='detalle" + (idx + 1) + "']").val()
                             if (typeof detalle === 'undefined') {
                                 detalle = ''
                             }
@@ -294,7 +299,10 @@
                             month: 'numeric',
                             day: 'numeric'
                         })
-                        const numberFormatter = new Intl.NumberFormat('es-CL', {minimumFractionDigits: 0, maximumFractionDigits: 0})
+                        const numberFormatter = new Intl.NumberFormat('es-CL', {
+                            minimumFractionDigits: 0,
+                            maximumFractionDigits: 0
+                        })
                         this.data.movimientos.forEach((row, idx) => {
                             tbody.append(
                                 $('<tr></tr>').append(
@@ -322,7 +330,7 @@
                         })
                         table.DataTable(this.dataTableConfig)
                     },
-                    centrosDropdown: (idx, ingreso=true) => {
+                    centrosDropdown: (idx, ingreso = true) => {
                         const menu = $('<div></div>').addClass('menu')
                         let centros = this.data.centrosCostos.ingresos
                         if (!ingreso) {
diff --git a/app/setup/setups/services.php b/app/setup/setups/services.php
index 6873212..6450aec 100644
--- a/app/setup/setups/services.php
+++ b/app/setup/setups/services.php
@@ -33,33 +33,33 @@ return [
             'port' => $container->get('REDIS_PORT')
         ]);
     },
-    Incoviba\Service\Cartola::class => function(ContainerInterface $container) {
-        return (new Incoviba\Service\Cartola(
+    \Incoviba\Service\Contabilidad\Cartola::class => function(ContainerInterface $container) {
+        return (new \Incoviba\Service\Contabilidad\Cartola(
             $container->get(Psr\Log\LoggerInterface::class),
             $container->get(Psr\Http\Message\StreamFactoryInterface::class),
             $container->get(Incoviba\Common\Define\Contabilidad\Exporter::class),
             $container->get(Incoviba\Repository\Inmobiliaria::class),
             $container->get(Incoviba\Repository\Inmobiliaria\Cuenta::class),
-            $container->get(Incoviba\Repository\Movimiento::class),
-            $container->get(Incoviba\Service\Movimiento::class),
-            $container->get(Incoviba\Repository\Cartola::class)
+            $container->get(\Incoviba\Repository\Contabilidad\Movimiento::class),
+            $container->get(\Incoviba\Service\Contabilidad\Movimiento::class),
+            $container->get(\Incoviba\Repository\Contabilidad\Cartola::class)
         ))
-            ->register('security', $container->get(Incoviba\Service\Cartola\Security::class))
-            ->register('itau', $container->get(Incoviba\Service\Cartola\Itau::class))
-            ->register('santander', $container->get(Incoviba\Service\Cartola\Santander::class))
-            ->register('bci', $container->get(Incoviba\Service\Cartola\BCI::class));
+            ->register('security', $container->get(\Incoviba\Service\Contabilidad\Cartola\Security::class))
+            ->register('itau', $container->get(\Incoviba\Service\Contabilidad\Cartola\Itau::class))
+            ->register('santander', $container->get(\Incoviba\Service\Contabilidad\Cartola\Santander::class))
+            ->register('bci', $container->get(\Incoviba\Service\Contabilidad\Cartola\BCI::class));
     },
     Incoviba\Common\Define\Contabilidad\Exporter::class => function(ContainerInterface $container) {
         return $container->get(Incoviba\Service\Contabilidad\Exporter\Nubox::class);
     },
     Incoviba\Service\Contabilidad\Exporter\Nubox::class => function(ContainerInterface $container) {
-        return new Incoviba\Service\Contabilidad\Exporter\Nubox($container->get(Incoviba\Repository\CentroCosto::class),
+        return new Incoviba\Service\Contabilidad\Exporter\Nubox($container->get(\Incoviba\Repository\Contabilidad\CentroCosto::class),
             $container->get('folders')->get('uploads'));
     },
     Incoviba\Service\Contabilidad\Nubox::class => function(ContainerInterface $container) {
         return new Incoviba\Service\Contabilidad\Nubox(
             $container->get(Psr\Log\LoggerInterface::class),
-            $container->get(Incoviba\Repository\Nubox::class),
+            $container->get(\Incoviba\Repository\Contabilidad\Nubox::class),
             $container->get(Incoviba\Service\Redis::class),
             new GuzzleHttp\Client(),
             $container->get(Psr\Http\Message\RequestFactoryInterface::class),
diff --git a/app/src/Controller/API/Contabilidad/Cartolas.php b/app/src/Controller/API/Contabilidad/Cartolas.php
index e8668af..179c7e2 100644
--- a/app/src/Controller/API/Contabilidad/Cartolas.php
+++ b/app/src/Controller/API/Contabilidad/Cartolas.php
@@ -1,24 +1,23 @@
 <?php
 namespace Incoviba\Controller\API\Contabilidad;
 
-use DateTimeInterface;
 use DateTimeImmutable;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
 use Incoviba\Common\Ideal\Controller;
 use Incoviba\Common\Implement\Exception\EmptyResult;
 use Incoviba\Controller\API\withJson;
 use Incoviba\Repository;
 use Incoviba\Service;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 
 class Cartolas extends Controller
 {
     use withJson;
 
-    public function procesar(ServerRequestInterface $request, ResponseInterface $response,
-                                    Repository\Inmobiliaria $inmobiliariaRepository,
-                                    Repository\Banco $bancoRepository,
-                                    Service\Cartola $cartolaService): ResponseInterface
+    public function procesar(ServerRequestInterface        $request, ResponseInterface $response,
+                             Repository\Inmobiliaria       $inmobiliariaRepository,
+                             Repository\Contabilidad\Banco $bancoRepository,
+                             Service\Contabilidad\Cartola  $cartolaService): ResponseInterface
     {
         $body = $request->getParsedBody();
         $output = [
@@ -34,10 +33,10 @@ class Cartolas extends Controller
         } catch (EmptyResult) {}
         return $this->withJson($response, $output);
     }
-    public function exportar(ServerRequestInterface $request, ResponseInterface $response,
-                                    Repository\Inmobiliaria $inmobiliariaRepository,
-                                    Repository\Banco $bancoRepository,
-                                    Service\Cartola $cartolaService): ResponseInterface
+    public function exportar(ServerRequestInterface        $request, ResponseInterface $response,
+                             Repository\Inmobiliaria       $inmobiliariaRepository,
+                             Repository\Contabilidad\Banco $bancoRepository,
+                             Service\Contabilidad\Cartola  $cartolaService): ResponseInterface
     {
         $body = $request->getParsedBody();
         $output = [
@@ -52,9 +51,9 @@ class Cartolas extends Controller
         } catch (EmptyResult) {}
         return $this->withJson($response, $output);
     }
-    public function diaria(ServerRequestInterface $request, ResponseInterface $response,
+    public function diaria(ServerRequestInterface         $request, ResponseInterface $response,
                            Repository\Inmobiliaria\Cuenta $cuentaRepository,
-                           Service\Cartola $cartolaService): ResponseInterface
+                           Service\Contabilidad\Cartola   $cartolaService): ResponseInterface
     {
         $body = $request->getParsedBody();
         $output = [
@@ -80,9 +79,9 @@ class Cartolas extends Controller
         }
         return $this->withJson($response, $output);
     }
-    public function ayer(ServerRequestInterface $request, ResponseInterface $response,
-                         Repository\Inmobiliaria\Cuenta $cuentaRepository,
-                         Repository\Cartola $cartolaRepository): ResponseInterface
+    public function ayer(ServerRequestInterface          $request, ResponseInterface $response,
+                         Repository\Inmobiliaria\Cuenta  $cuentaRepository,
+                         Repository\Contabilidad\Cartola $cartolaRepository): ResponseInterface
     {
         $body = $request->getParsedBody();
         $output = [
diff --git a/app/src/Controller/API/CentrosCostos.php b/app/src/Controller/API/Contabilidad/CentrosCostos.php
similarity index 68%
rename from app/src/Controller/API/CentrosCostos.php
rename to app/src/Controller/API/Contabilidad/CentrosCostos.php
index f1466b5..2cca4da 100644
--- a/app/src/Controller/API/CentrosCostos.php
+++ b/app/src/Controller/API/Contabilidad/CentrosCostos.php
@@ -1,17 +1,18 @@
 <?php
-namespace Incoviba\Controller\API;
+namespace Incoviba\Controller\API\Contabilidad;
 
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
 use Incoviba\Common\Implement\Exception\EmptyResult;
+use Incoviba\Controller\API\withJson;
 use Incoviba\Repository;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 
 class CentrosCostos
 {
     use withJson;
 
-    public function add(ServerRequestInterface $request, ResponseInterface $response,
-                        Repository\CentroCosto $centroCostoRepository): ResponseInterface
+    public function add(ServerRequestInterface              $request, ResponseInterface $response,
+                        Repository\Contabilidad\CentroCosto $centroCostoRepository): ResponseInterface
     {
         $body = $request->getParsedBody();
         $output = [
@@ -26,8 +27,8 @@ class CentrosCostos
         } catch (EmptyResult) {}
         return $this->withJson($response, $output);
     }
-    public function edit(ServerRequestInterface $request, ResponseInterface $response,
-                         Repository\CentroCosto $centroCostoRepository, int $centro_costo_id): ResponseInterface
+    public function edit(ServerRequestInterface              $request, ResponseInterface $response,
+                         Repository\Contabilidad\CentroCosto $centroCostoRepository, int $centro_costo_id): ResponseInterface
     {
         $body = $request->getParsedBody();
         $output = [
@@ -45,8 +46,8 @@ class CentrosCostos
         } catch (EmptyResult) {}
         return $this->withJson($response, $output);
     }
-    public function remove(ServerRequestInterface $request, ResponseInterface $response,
-                           Repository\CentroCosto $centroCostoRepository, int $centro_costo_id): ResponseInterface
+    public function remove(ServerRequestInterface              $request, ResponseInterface $response,
+                           Repository\Contabilidad\CentroCosto $centroCostoRepository, int $centro_costo_id): ResponseInterface
     {
         $output = [
             'centro_costo_id' => $centro_costo_id,
diff --git a/app/src/Controller/API/Contabilidad/Depositos.php b/app/src/Controller/API/Contabilidad/Depositos.php
index 26cb074..f77d161 100644
--- a/app/src/Controller/API/Contabilidad/Depositos.php
+++ b/app/src/Controller/API/Contabilidad/Depositos.php
@@ -2,23 +2,23 @@
 namespace Incoviba\Controller\API\Contabilidad;
 
 use DateTimeImmutable;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
 use Incoviba\Common\Ideal;
 use Incoviba\Common\Implement;
 use Incoviba\Controller\API\withJson;
 use Incoviba\Repository;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 
 class Depositos extends Ideal\Controller
 {
     use withJson;
 
-    public function inmobiliaria(ServerRequestInterface         $request, ResponseInterface $response,
-                                 Repository\Inmobiliaria        $inmobiliariaRepository,
-                                 Repository\Banco               $bancoRepository,
-                                 Repository\Inmobiliaria\Cuenta $cuentaRepository,
-                                 Repository\Deposito            $dapRepository,
-                                 int                            $inmobiliaria_rut): ResponseInterface
+    public function inmobiliaria(ServerRequestInterface           $request, ResponseInterface $response,
+                                 Repository\Inmobiliaria          $inmobiliariaRepository,
+                                 Repository\Contabilidad\Banco    $bancoRepository,
+                                 Repository\Inmobiliaria\Cuenta   $cuentaRepository,
+                                 Repository\Contabilidad\Deposito $dapRepository,
+                                 int                              $inmobiliaria_rut): ResponseInterface
     {
         $output = [
             'inmobiliaria_rut' => $inmobiliaria_rut,
@@ -33,10 +33,10 @@ class Depositos extends Ideal\Controller
         } catch (Implement\Exception\EmptyResult) {}
         return $this->withJson($response, $output);
     }
-    public function add(ServerRequestInterface         $request, ResponseInterface $response,
-                        Repository\Inmobiliaria        $inmobiliariaRepository, Repository\Banco $bancoRepository,
-                        Repository\Inmobiliaria\Cuenta $cuentaRepository,
-                        Repository\Deposito            $dapRepository): ResponseInterface
+    public function add(ServerRequestInterface           $request, ResponseInterface $response,
+                        Repository\Inmobiliaria          $inmobiliariaRepository, Repository\Contabilidad\Banco $bancoRepository,
+                        Repository\Inmobiliaria\Cuenta   $cuentaRepository,
+                        Repository\Contabilidad\Deposito $dapRepository): ResponseInterface
     {
         $body = $request->getParsedBody();
         $output = [
diff --git a/app/src/Controller/API/Contabilidad/Movimientos.php b/app/src/Controller/API/Contabilidad/Movimientos.php
index e792b86..f1cf7d6 100644
--- a/app/src/Controller/API/Contabilidad/Movimientos.php
+++ b/app/src/Controller/API/Contabilidad/Movimientos.php
@@ -1,21 +1,21 @@
 <?php
 namespace Incoviba\Controller\API\Contabilidad;
 
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
+use Incoviba\Common\Ideal;
 use Incoviba\Common\Implement\Exception\EmptyResult;
 use Incoviba\Controller\API\withJson;
-use Incoviba\Common\Ideal;
 use Incoviba\Repository;
 use Incoviba\Service;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 
 class Movimientos extends Ideal\Controller
 {
     use withJson;
 
-    public function detalles(ServerRequestInterface $request, ResponseInterface $response,
-                             Service\Movimiento     $movimientoService,
-                             Repository\CentroCosto $centroCostoRepository, int $movimiento_id): ResponseInterface
+    public function detalles(ServerRequestInterface              $request, ResponseInterface $response,
+                             Service\Contabilidad\Movimiento     $movimientoService,
+                             Repository\Contabilidad\CentroCosto $centroCostoRepository, int $movimiento_id): ResponseInterface
     {
         $body = $request->getParsedBody();
         $output = [
diff --git a/app/src/Controller/API/Nubox.php b/app/src/Controller/API/Contabilidad/Nubox.php
similarity index 97%
rename from app/src/Controller/API/Nubox.php
rename to app/src/Controller/API/Contabilidad/Nubox.php
index cc1d323..b46ffa6 100644
--- a/app/src/Controller/API/Nubox.php
+++ b/app/src/Controller/API/Contabilidad/Nubox.php
@@ -1,11 +1,12 @@
 <?php
-namespace Incoviba\Controller\API;
+namespace Incoviba\Controller\API\Contabilidad;
 
 use DateTimeImmutable;
+use Incoviba\Common\Implement\Exception\HttpResponse;
+use Incoviba\Controller\API\withJson;
+use Incoviba\Service;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Incoviba\Common\Implement\Exception\HttpResponse;
-use Incoviba\Service;
 
 class Nubox
 {
diff --git a/app/src/Controller/CentrosCostos.php b/app/src/Controller/CentrosCostos.php
deleted file mode 100644
index 6854b8b..0000000
--- a/app/src/Controller/CentrosCostos.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-namespace Incoviba\Controller;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Incoviba\Repository;
-use Incoviba\Common\Alias\View;
-
-class CentrosCostos
-{
-    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, View $view,
-                             Repository\CentroCosto $centroCostoRepository,
-                             Repository\TipoCentro $tipoCentroRepository,
-                             Repository\CategoriaCentro $categoriaCentroRepository,
-                             Repository\TipoCuenta $tipoCuentaRepository): ResponseInterface
-    {
-        $centrosCostos = $centroCostoRepository->fetchAll();
-        $tiposCentros = $tipoCentroRepository->fetchAll();
-        $categorias = $categoriaCentroRepository->fetchAll('descripcion');
-        $tiposCuentas = $tipoCuentaRepository->fetchAll();
-        return $view->render($response, 'contabilidad.centros_costos', compact('centrosCostos',
-            'tiposCentros', 'categorias', 'tiposCuentas'));
-    }
-    public function asignar(ServerRequestInterface $request, ResponseInterface $response, View $view,
-                            Repository\CentroCosto $centroCostoRepository,
-                            Repository\Inmobiliaria $inmobiliariaRepository): ResponseInterface
-    {
-        $centrosCostos = $centroCostoRepository->fetchAll();
-        $inmobiliarias = $inmobiliariaRepository->fetchAllActive('razon');
-        return $view->render($response, 'contabilidad.centros_costos.asignar', compact('centrosCostos', 'inmobiliarias'));
-    }
-}
diff --git a/app/src/Controller/Contabilidad.php b/app/src/Controller/Contabilidad.php
index 23d2bad..3826bd5 100644
--- a/app/src/Controller/Contabilidad.php
+++ b/app/src/Controller/Contabilidad.php
@@ -1,25 +1,25 @@
 <?php
 namespace Incoviba\Controller;
 
-use DateTimeImmutable;
 use DateInterval;
-use Incoviba\Common\Ideal\Controller;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
+use DateTimeImmutable;
 use Incoviba\Common\Alias\View;
-use Incoviba\Common\Implement\Exception\{EmptyResult, EmptyRedis};
+use Incoviba\Common\Ideal\Controller;
+use Incoviba\Common\Implement\Exception\{EmptyRedis, EmptyResult};
 use Incoviba\Model;
 use Incoviba\Repository;
 use Incoviba\Service;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 
 class Contabilidad extends Controller
 {
     use withRedis;
 
-    public function diaria(ServerRequestInterface $request, ResponseInterface $response, View $view,
-                           Service\Redis $redisService,
-                           Repository\Inmobiliaria $inmobiliariaRepository,
-                           Repository\CentroCosto $centroCostoRepository): ResponseInterface
+    public function diaria(ServerRequestInterface              $request, ResponseInterface $response, View $view,
+                           Service\Redis                       $redisService,
+                           Repository\Inmobiliaria             $inmobiliariaRepository,
+                           Repository\Contabilidad\CentroCosto $centroCostoRepository): ResponseInterface
     {
         $redisKey = 'inmobiliarias';
         $inmobiliarias = [];
@@ -34,10 +34,10 @@ class Contabilidad extends Controller
         $centrosCostos = $centroCostoRepository->fetchAll();
         return $view->render($response, 'contabilidad.cartolas.diaria', compact('inmobiliarias', 'centrosCostos'));
     }
-    public function depositos(ServerRequestInterface  $request, ResponseInterface $response, View $view,
-                              Service\Redis           $redisService,
-                              Repository\Inmobiliaria $inmobiliariaRepository,
-                              Repository\Deposito     $dapRepository): ResponseInterface
+    public function depositos(ServerRequestInterface           $request, ResponseInterface $response, View $view,
+                              Service\Redis                    $redisService,
+                              Repository\Inmobiliaria          $inmobiliariaRepository,
+                              Repository\Contabilidad\Deposito $dapRepository): ResponseInterface
     {
         $redisKey = 'inmobiliarias';
         $inmobiliarias = [];
@@ -54,11 +54,11 @@ class Contabilidad extends Controller
             $depositos = $dapRepository->fetchAll();
         } catch (EmptyResult) {}
         $fecha = new DateTimeImmutable('today');
-        $activos = array_filter($depositos, function(Model\Deposito $deposito) use ($fecha) {
+        $activos = array_filter($depositos, function(Model\Contabilidad\Deposito $deposito) use ($fecha) {
             return $deposito->termino >= $fecha;
         });
         $mes = $fecha->sub(new DateInterval('P1M'));
-        $vencidos = array_filter($depositos, function(Model\Deposito $deposito) use ($fecha, $mes) {
+        $vencidos = array_filter($depositos, function(Model\Contabilidad\Deposito $deposito) use ($fecha, $mes) {
             return $deposito->termino < $fecha and $deposito->termino >= $mes;
         });
         return $view->render($response, 'contabilidad.depositos', compact('inmobiliarias', 'activos', 'vencidos'));
diff --git a/app/src/Controller/Contabilidad/CentrosCostos.php b/app/src/Controller/Contabilidad/CentrosCostos.php
new file mode 100644
index 0000000..45e539c
--- /dev/null
+++ b/app/src/Controller/Contabilidad/CentrosCostos.php
@@ -0,0 +1,32 @@
+<?php
+namespace Incoviba\Controller\Contabilidad;
+
+use Incoviba\Common\Alias\View;
+use Incoviba\Repository;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+class CentrosCostos
+{
+    public function __invoke(ServerRequestInterface                  $request, ResponseInterface $response, View $view,
+                             Repository\Contabilidad\CentroCosto     $centroCostoRepository,
+                             Repository\Contabilidad\TipoCentro      $tipoCentroRepository,
+                             Repository\Contabilidad\CategoriaCentro $categoriaCentroRepository,
+                             Repository\TipoCuenta                   $tipoCuentaRepository): ResponseInterface
+    {
+        $centrosCostos = $centroCostoRepository->fetchAll();
+        $tiposCentros = $tipoCentroRepository->fetchAll();
+        $categorias = $categoriaCentroRepository->fetchAll('descripcion');
+        $tiposCuentas = $tipoCuentaRepository->fetchAll();
+        return $view->render($response, 'contabilidad.centros_costos', compact('centrosCostos',
+            'tiposCentros', 'categorias', 'tiposCuentas'));
+    }
+    public function asignar(ServerRequestInterface              $request, ResponseInterface $response, View $view,
+                            Repository\Contabilidad\CentroCosto $centroCostoRepository,
+                            Repository\Inmobiliaria             $inmobiliariaRepository): ResponseInterface
+    {
+        $centrosCostos = $centroCostoRepository->fetchAll();
+        $inmobiliarias = $inmobiliariaRepository->fetchAllActive('razon');
+        return $view->render($response, 'contabilidad.centros_costos.asignar', compact('centrosCostos', 'inmobiliarias'));
+    }
+}
diff --git a/app/src/Controller/Ventas.php b/app/src/Controller/Ventas.php
index e6a7fda..38e665e 100644
--- a/app/src/Controller/Ventas.php
+++ b/app/src/Controller/Ventas.php
@@ -1,14 +1,14 @@
 <?php
 namespace Incoviba\Controller;
 
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
 use Incoviba\Common\Alias\View;
-use Incoviba\Common\Implement\Exception\EmptyResult;
 use Incoviba\Common\Implement\Exception\EmptyRedis;
+use Incoviba\Common\Implement\Exception\EmptyResult;
 use Incoviba\Model;
 use Incoviba\Repository;
 use Incoviba\Service;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 
 class Ventas
 {
@@ -103,12 +103,12 @@ class Ventas
         $venta = $ventaService->getById($venta_id);
         return $view->render($response, 'ventas.pies.cuotas', compact('venta'));
     }
-    public function escriturar(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $ventaService,
-                               Repository\Banco $bancoRepository, View $view, int $venta_id): ResponseInterface
+    public function escriturar(ServerRequestInterface        $request, ResponseInterface $response, Service\Venta $ventaService,
+                               Repository\Contabilidad\Banco $bancoRepository, View $view, int $venta_id): ResponseInterface
     {
         $venta = $ventaService->getById($venta_id);
         $bancos = $bancoRepository->fetchAll();
-        usort($bancos, function(Model\Banco $a, Model\Banco $b) {
+        usort($bancos, function(Model\Contabilidad\Banco $a, Model\Contabilidad\Banco $b) {
             return strcmp($a->nombre, $b->nombre);
         });
         return $view->render($response, 'ventas.escriturar', compact('venta', 'bancos'));
diff --git a/app/src/Controller/Ventas/Creditos.php b/app/src/Controller/Ventas/Creditos.php
index f4e4cc7..a5a7f2f 100644
--- a/app/src/Controller/Ventas/Creditos.php
+++ b/app/src/Controller/Ventas/Creditos.php
@@ -1,17 +1,17 @@
 <?php
 namespace Incoviba\Controller\Ventas;
 
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
 use Incoviba\Common\Alias\View;
 use Incoviba\Common\Ideal\Controller;
 use Incoviba\Repository;
 use Incoviba\Service;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 
 class Creditos extends Controller
 {
     public function show(ServerRequestInterface $request, ResponseInterface $response, View $view,
-                         Service\Venta          $ventaService, Repository\Banco $bancoRepository,
+                         Service\Venta          $ventaService, Repository\Contabilidad\Banco $bancoRepository,
                          int                    $venta_id): ResponseInterface
     {
         $venta = $ventaService->getById($venta_id);
diff --git a/app/src/Controller/Ventas/Cuotas.php b/app/src/Controller/Ventas/Cuotas.php
index 0c03d72..a88afca 100644
--- a/app/src/Controller/Ventas/Cuotas.php
+++ b/app/src/Controller/Ventas/Cuotas.php
@@ -2,13 +2,13 @@
 namespace Incoviba\Controller\Ventas;
 
 use DateTimeImmutable;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Incoviba\Common\Implement\Exception\EmptyResult;
 use Incoviba\Common\Alias\View;
+use Incoviba\Common\Implement\Exception\EmptyResult;
+use Incoviba\Model;
 use Incoviba\Repository;
 use Incoviba\Service;
-use Incoviba\Model;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 
 class Cuotas
 {
@@ -73,12 +73,12 @@ class Cuotas
         $response->getBody()->write(json_encode($output));
         return $response->withHeader('Content-Type', 'application/json');
     }
-    public function add(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pie $pieService, Repository\Venta $ventaRepository, Repository\Banco $bancoRepository, View $view, int $pie_id): ResponseInterface
+    public function add(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pie $pieService, Repository\Venta $ventaRepository, Repository\Contabilidad\Banco $bancoRepository, View $view, int $pie_id): ResponseInterface
     {
         $pie = $pieService->getById($pie_id);
         $venta = $ventaRepository->fetchByPie($pie_id);
         $bancos = $bancoRepository->fetchAll();
-        usort($bancos, function(Model\Banco $a, Model\Banco $b) {
+        usort($bancos, function(Model\Contabilidad\Banco $a, Model\Contabilidad\Banco $b) {
             return strcmp($a->nombre, $b->nombre);
         });
         return $view->render($response, 'ventas.pies.cuotas.add', compact('pie', 'venta', 'bancos'));
diff --git a/app/src/Controller/Ventas/Escrituras.php b/app/src/Controller/Ventas/Escrituras.php
index 86fcd62..31b71c4 100644
--- a/app/src/Controller/Ventas/Escrituras.php
+++ b/app/src/Controller/Ventas/Escrituras.php
@@ -1,11 +1,11 @@
 <?php
 namespace Incoviba\Controller\Ventas;
 
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
 use Incoviba\Common\Alias\View;
 use Incoviba\Repository;
 use Incoviba\Service;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 
 class Escrituras
 {
@@ -22,8 +22,8 @@ class Escrituras
         return $view->render($response, 'ventas.escrituras.informe', compact('venta'));
     }
     public function add(ServerRequestInterface $request, ResponseInterface $response, View $view,
-                        Service\Venta $ventaService, Repository\Banco $bancoRepository,
-                        int $venta_id): ResponseInterface
+                        Service\Venta          $ventaService, Repository\Contabilidad\Banco $bancoRepository,
+                        int                    $venta_id): ResponseInterface
     {
         $venta = $ventaService->getById($venta_id);
         $bancos = $bancoRepository->fetchAll('nombre');
diff --git a/app/src/Controller/Ventas/Pies.php b/app/src/Controller/Ventas/Pies.php
index 21e5fcc..648b342 100644
--- a/app/src/Controller/Ventas/Pies.php
+++ b/app/src/Controller/Ventas/Pies.php
@@ -1,21 +1,21 @@
 <?php
 namespace Incoviba\Controller\Ventas;
 
+use Incoviba\Common\Alias\View;
+use Incoviba\Model;
+use Incoviba\Repository;
+use Incoviba\Service;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Incoviba\Common\Alias\View;
-use Incoviba\Service;
-use Incoviba\Repository;
-use Incoviba\Model;
 
 class Pies
 {
-    public function cuotas(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pie $pieService, Repository\Venta $ventaRepository, Repository\Banco $bancoRepository, View $view, int $pie_id): ResponseInterface
+    public function cuotas(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pie $pieService, Repository\Venta $ventaRepository, Repository\Contabilidad\Banco $bancoRepository, View $view, int $pie_id): ResponseInterface
     {
         $pie = $pieService->getById($pie_id);
         $venta = $ventaRepository->fetchByPie($pie_id);
         $bancos = $bancoRepository->fetchAll();
-        usort($bancos, function(Model\Banco $a, Model\Banco $b) {
+        usort($bancos, function(Model\Contabilidad\Banco $a, Model\Contabilidad\Banco $b) {
             return strcmp($a->nombre, $b->nombre);
         });
         return $view->render($response, 'ventas.pies.cuotas', compact('pie', 'venta', 'bancos'));
diff --git a/app/src/Model/CategoriaCentro.php b/app/src/Model/CategoriaCentro.php
deleted file mode 100644
index e131f86..0000000
--- a/app/src/Model/CategoriaCentro.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-namespace Incoviba\Model;
-
-class CategoriaCentro extends Tipo
-{}
diff --git a/app/src/Model/Banco.php b/app/src/Model/Contabilidad/Banco.php
similarity index 87%
rename from app/src/Model/Banco.php
rename to app/src/Model/Contabilidad/Banco.php
index 1852ff2..df628a0 100644
--- a/app/src/Model/Banco.php
+++ b/app/src/Model/Contabilidad/Banco.php
@@ -1,5 +1,5 @@
 <?php
-namespace Incoviba\Model;
+namespace Incoviba\Model\Contabilidad;
 
 use Incoviba\Common\Ideal\Model;
 
diff --git a/app/src/Model/Cartola.php b/app/src/Model/Contabilidad/Cartola.php
similarity index 89%
rename from app/src/Model/Cartola.php
rename to app/src/Model/Contabilidad/Cartola.php
index 49363b6..8018c8c 100644
--- a/app/src/Model/Cartola.php
+++ b/app/src/Model/Contabilidad/Cartola.php
@@ -1,8 +1,9 @@
 <?php
-namespace Incoviba\Model;
+namespace Incoviba\Model\Contabilidad;
 
 use DateTimeInterface;
 use Incoviba\Common\Ideal;
+use Incoviba\Model\Inmobiliaria;
 
 class Cartola extends Ideal\Model
 {
diff --git a/app/src/Model/Contabilidad/CategoriaCentro.php b/app/src/Model/Contabilidad/CategoriaCentro.php
new file mode 100644
index 0000000..b71bf36
--- /dev/null
+++ b/app/src/Model/Contabilidad/CategoriaCentro.php
@@ -0,0 +1,7 @@
+<?php
+namespace Incoviba\Model\Contabilidad;
+
+use Incoviba\Model\Tipo;
+
+class CategoriaCentro extends Tipo
+{}
diff --git a/app/src/Model/CentroCosto.php b/app/src/Model/Contabilidad/CentroCosto.php
similarity index 89%
rename from app/src/Model/CentroCosto.php
rename to app/src/Model/Contabilidad/CentroCosto.php
index fd4d5ef..c2f6825 100644
--- a/app/src/Model/CentroCosto.php
+++ b/app/src/Model/Contabilidad/CentroCosto.php
@@ -1,7 +1,8 @@
 <?php
-namespace Incoviba\Model;
+namespace Incoviba\Model\Contabilidad;
 
 use Incoviba\Common\Ideal;
+use Incoviba\Model\TipoCuenta;
 
 class CentroCosto extends Ideal\Model
 {
diff --git a/app/src/Model/Deposito.php b/app/src/Model/Contabilidad/Deposito.php
similarity index 92%
rename from app/src/Model/Deposito.php
rename to app/src/Model/Contabilidad/Deposito.php
index da32727..8ace7a2 100644
--- a/app/src/Model/Deposito.php
+++ b/app/src/Model/Contabilidad/Deposito.php
@@ -1,8 +1,9 @@
 <?php
-namespace Incoviba\Model;
+namespace Incoviba\Model\Contabilidad;
 
 use DateTimeInterface;
 use Incoviba\Common\Ideal;
+use Incoviba\Model\Inmobiliaria;
 
 class Deposito extends Ideal\Model
 {
diff --git a/app/src/Model/Movimiento.php b/app/src/Model/Contabilidad/Movimiento.php
similarity index 94%
rename from app/src/Model/Movimiento.php
rename to app/src/Model/Contabilidad/Movimiento.php
index 1fcc911..8bb0b91 100644
--- a/app/src/Model/Movimiento.php
+++ b/app/src/Model/Contabilidad/Movimiento.php
@@ -1,9 +1,10 @@
 <?php
-namespace Incoviba\Model;
+namespace Incoviba\Model\Contabilidad;
 
 use DateTimeInterface;
 use Incoviba\Common\Ideal;
 use Incoviba\Common\Implement\Exception\EmptyResult;
+use Incoviba\Model\Inmobiliaria;
 use Incoviba\Model\Movimiento\Detalle;
 
 class Movimiento extends Ideal\Model
diff --git a/app/src/Model/Nubox.php b/app/src/Model/Contabilidad/Nubox.php
similarity index 81%
rename from app/src/Model/Nubox.php
rename to app/src/Model/Contabilidad/Nubox.php
index 05b223a..ed0f14d 100644
--- a/app/src/Model/Nubox.php
+++ b/app/src/Model/Contabilidad/Nubox.php
@@ -1,8 +1,8 @@
 <?php
-namespace Incoviba\Model;
+namespace Incoviba\Model\Contabilidad;
 
-use Incoviba\Common\Define;
 use Incoviba\Common\Ideal;
+use Incoviba\Model\Inmobiliaria;
 
 class Nubox extends Ideal\Model
 {
diff --git a/app/src/Model/PagoCentroCosto.php b/app/src/Model/Contabilidad/PagoCentroCosto.php
similarity index 84%
rename from app/src/Model/PagoCentroCosto.php
rename to app/src/Model/Contabilidad/PagoCentroCosto.php
index 5be8849..46e1c7c 100644
--- a/app/src/Model/PagoCentroCosto.php
+++ b/app/src/Model/Contabilidad/PagoCentroCosto.php
@@ -1,7 +1,8 @@
 <?php
-namespace Incoviba\Model;
+namespace Incoviba\Model\Contabilidad;
 
 use Incoviba\Common\Ideal;
+use Incoviba\Model\Venta;
 
 class PagoCentroCosto extends Ideal\Model
 {
diff --git a/app/src/Model/Contabilidad/TipoCentro.php b/app/src/Model/Contabilidad/TipoCentro.php
new file mode 100644
index 0000000..fc65260
--- /dev/null
+++ b/app/src/Model/Contabilidad/TipoCentro.php
@@ -0,0 +1,7 @@
+<?php
+namespace Incoviba\Model\Contabilidad;
+
+use Incoviba\Model\Tipo;
+
+class TipoCentro extends Tipo
+{}
diff --git a/app/src/Model/Inmobiliaria/Cuenta.php b/app/src/Model/Inmobiliaria/Cuenta.php
index 08459dd..1ca0b9d 100644
--- a/app/src/Model/Inmobiliaria/Cuenta.php
+++ b/app/src/Model/Inmobiliaria/Cuenta.php
@@ -8,7 +8,7 @@ use Incoviba\Model;
 class Cuenta extends Ideal\Model
 {
     public Model\Inmobiliaria $inmobiliaria;
-    public Model\Banco $banco;
+    public Model\Contabilidad\Banco $banco;
     public string $cuenta;
 
     protected array $estados;
diff --git a/app/src/Model/Movimiento/Detalle.php b/app/src/Model/Movimiento/Detalle.php
index ec56449..96a75d5 100644
--- a/app/src/Model/Movimiento/Detalle.php
+++ b/app/src/Model/Movimiento/Detalle.php
@@ -6,8 +6,8 @@ use Incoviba\Model;
 
 class Detalle extends Ideal\Model
 {
-    public Model\Movimiento $movimiento;
-    public ?Model\CentroCosto $centroCosto;
+    public Model\Contabilidad\Movimiento $movimiento;
+    public ?Model\Contabilidad\CentroCosto $centroCosto;
     public ?string $detalle;
 
     public function jsonSerialize(): mixed
diff --git a/app/src/Model/TipoCentro.php b/app/src/Model/TipoCentro.php
deleted file mode 100644
index 9c23000..0000000
--- a/app/src/Model/TipoCentro.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-namespace Incoviba\Model;
-
-class TipoCentro extends Tipo
-{}
diff --git a/app/src/Model/Venta/Cuota.php b/app/src/Model/Venta/Cuota.php
index 05dfb41..a0a8db3 100644
--- a/app/src/Model/Venta/Cuota.php
+++ b/app/src/Model/Venta/Cuota.php
@@ -3,7 +3,7 @@ namespace Incoviba\Model\Venta;
 
 use DateTimeInterface;
 use Incoviba\Common\Ideal\Model;
-use Incoviba\Model\Banco;
+use Incoviba\Model\Contabilidad\Banco;
 
 class Cuota extends Model
 {
diff --git a/app/src/Model/Venta/Pago.php b/app/src/Model/Venta/Pago.php
index c983b22..103e17c 100644
--- a/app/src/Model/Venta/Pago.php
+++ b/app/src/Model/Venta/Pago.php
@@ -3,7 +3,7 @@ namespace Incoviba\Model\Venta;
 
 use DateTimeInterface;
 use Incoviba\Common\Ideal\Model;
-use Incoviba\Model\Banco;
+use Incoviba\Model\Contabilidad\Banco;
 
 class Pago extends Model
 {
diff --git a/app/src/Repository/Banco.php b/app/src/Repository/Contabilidad/Banco.php
similarity index 86%
rename from app/src/Repository/Banco.php
rename to app/src/Repository/Contabilidad/Banco.php
index 00afc45..af6c350 100644
--- a/app/src/Repository/Banco.php
+++ b/app/src/Repository/Contabilidad/Banco.php
@@ -1,5 +1,5 @@
 <?php
-namespace Incoviba\Repository;
+namespace Incoviba\Repository\Contabilidad;
 
 use Incoviba\Common\Define;
 use Incoviba\Common\Ideal;
@@ -17,7 +17,7 @@ class Banco extends Ideal\Repository
     public function create(?array $data = null): Define\Model
     {
         $map = new Implement\Repository\MapperParser(['nombre']);
-        return $this->parseData(new Model\Banco(), $data, $map);
+        return $this->parseData(new Model\Contabilidad\Banco(), $data, $map);
     }
     public function save(Define\Model $model): Define\Model
     {
diff --git a/app/src/Repository/Cartola.php b/app/src/Repository/Contabilidad/Cartola.php
similarity index 85%
rename from app/src/Repository/Cartola.php
rename to app/src/Repository/Contabilidad/Cartola.php
index 4271ad7..24ae165 100644
--- a/app/src/Repository/Cartola.php
+++ b/app/src/Repository/Contabilidad/Cartola.php
@@ -1,5 +1,5 @@
 <?php
-namespace Incoviba\Repository;
+namespace Incoviba\Repository\Contabilidad;
 
 use DateTimeInterface;
 use Incoviba\Common\Define;
@@ -16,7 +16,7 @@ class Cartola extends Ideal\Repository
         $this->setTable('cartolas');
     }
 
-    public function create(?array $data = null): Model\Cartola
+    public function create(?array $data = null): Model\Contabilidad\Cartola
     {
         $map = (new Implement\Repository\MapperParser(['cargos', 'abonos', 'saldo']))
             ->register('fecha', new Implement\Repository\Mapper\DateTime('fecha'))
@@ -25,9 +25,9 @@ class Cartola extends Ideal\Repository
                 ->setFunction(function($data) {
                     return $this->cuentaRepository->fetchById($data['cuenta_id']);
                 }));
-        return $this->parseData(new Model\Cartola(), $data, $map);
+        return $this->parseData(new Model\Contabilidad\Cartola(), $data, $map);
     }
-    public function save(Define\Model $model): Model\Cartola
+    public function save(Define\Model $model): Model\Contabilidad\Cartola
     {
         $model->id = $this->saveNew([
             'cuenta_id',
@@ -44,7 +44,7 @@ class Cartola extends Ideal\Repository
         ]);
         return $model;
     }
-    public function edit(Define\Model $model, array $new_data): Model\Cartola
+    public function edit(Define\Model $model, array $new_data): Model\Contabilidad\Cartola
     {
         return $this->update($model, ['cuenta_id', 'fecha', 'cargos', 'abonos', 'saldo'], $new_data);
     }
@@ -57,7 +57,7 @@ class Cartola extends Ideal\Repository
             ->where('fecha = ?');
         return $this->fetchMany($query, [$fecha->format('Y-m-d')]);
     }
-    public function fetchByCuentaAndFecha(int $cuenta_id, DateTimeInterface $fecha): Model\Cartola
+    public function fetchByCuentaAndFecha(int $cuenta_id, DateTimeInterface $fecha): Model\Contabilidad\Cartola
     {
         $query = $this->connection->getQueryBuilder()
             ->select()
@@ -65,7 +65,7 @@ class Cartola extends Ideal\Repository
             ->where('cuenta_id = ? AND fecha = ?');
         return $this->fetchOne($query, [$cuenta_id, $fecha->format('Y-m-d')]);
     }
-    public function fetchLastByCuentaAndFecha(int $cuenta_id, DateTimeInterface $fecha): Model\Cartola
+    public function fetchLastByCuentaAndFecha(int $cuenta_id, DateTimeInterface $fecha): Model\Contabilidad\Cartola
     {
         $query = $this->connection->getQueryBuilder()
             ->select()
diff --git a/app/src/Repository/CategoriaCentro.php b/app/src/Repository/Contabilidad/CategoriaCentro.php
similarity index 71%
rename from app/src/Repository/CategoriaCentro.php
rename to app/src/Repository/Contabilidad/CategoriaCentro.php
index 4ed43de..e66a4c1 100644
--- a/app/src/Repository/CategoriaCentro.php
+++ b/app/src/Repository/Contabilidad/CategoriaCentro.php
@@ -1,8 +1,9 @@
 <?php
-namespace Incoviba\Repository;
+namespace Incoviba\Repository\Contabilidad;
 
 use Incoviba\Common\Define;
 use Incoviba\Model;
+use Incoviba\Repository\Tipo;
 
 class CategoriaCentro extends Tipo
 {
@@ -14,6 +15,6 @@ class CategoriaCentro extends Tipo
 
     protected function getBlank(): Define\Model
     {
-        return new Model\CategoriaCentro();
+        return new Model\Contabilidad\CategoriaCentro();
     }
 }
diff --git a/app/src/Repository/CentroCosto.php b/app/src/Repository/Contabilidad/CentroCosto.php
similarity index 88%
rename from app/src/Repository/CentroCosto.php
rename to app/src/Repository/Contabilidad/CentroCosto.php
index dbd41fb..40bd5c5 100644
--- a/app/src/Repository/CentroCosto.php
+++ b/app/src/Repository/Contabilidad/CentroCosto.php
@@ -1,12 +1,12 @@
 <?php
-namespace Incoviba\Repository;
+namespace Incoviba\Repository\Contabilidad;
 
 use Incoviba\Common\Define;
 use Incoviba\Common\Ideal;
 use Incoviba\Common\Implement\Repository\Mapper;
 use Incoviba\Common\Implement\Repository\MapperParser;
-use Incoviba\Repository;
 use Incoviba\Model;
+use Incoviba\Repository\TipoCuenta;
 
 class CentroCosto extends Ideal\Repository
 {
@@ -18,7 +18,7 @@ class CentroCosto extends Ideal\Repository
         $this->setTable('centros_costos');
     }
 
-    public function create(?array $data = null): Model\CentroCosto
+    public function create(?array $data = null): Model\Contabilidad\CentroCosto
     {
         $map = (new MapperParser(['descripcion']))
             ->register('tipo_centro_id', (new Mapper())
@@ -39,9 +39,9 @@ class CentroCosto extends Ideal\Repository
                 ->setDefault(null))
             ->register('cuenta_contable', (new Mapper())
                 ->setProperty('cuentaContable'));
-        return $this->parseData(new Model\CentroCosto(), $data, $map);
+        return $this->parseData(new Model\Contabilidad\CentroCosto(), $data, $map);
     }
-    public function save(Define\Model $model): Model\CentroCosto
+    public function save(Define\Model $model): Model\Contabilidad\CentroCosto
     {
         $this->saveNew(
             ['id', 'tipo_centro_id', 'categoria_id', 'tipo_cuenta_id', 'cuenta_contable', 'descripcion'],
@@ -49,12 +49,12 @@ class CentroCosto extends Ideal\Repository
         );
         return $model;
     }
-    public function edit(Define\Model $model, array $new_data): Model\CentroCosto
+    public function edit(Define\Model $model, array $new_data): Model\Contabilidad\CentroCosto
     {
         return $this->update($model, ['tipo_centro_id', 'categoria_id', 'tipo_cuenta_id', 'cuenta_contable', 'descripcion'], $new_data);
     }
 
-    public function fetchByDescripcion(string $descripcion): Model\CentroCosto
+    public function fetchByDescripcion(string $descripcion): Model\Contabilidad\CentroCosto
     {
         $query = $this->connection->getQueryBuilder()
             ->select()
diff --git a/app/src/Repository/Deposito.php b/app/src/Repository/Contabilidad/Deposito.php
similarity index 87%
rename from app/src/Repository/Deposito.php
rename to app/src/Repository/Contabilidad/Deposito.php
index b006403..61b9988 100644
--- a/app/src/Repository/Deposito.php
+++ b/app/src/Repository/Contabilidad/Deposito.php
@@ -1,12 +1,12 @@
 <?php
-namespace Incoviba\Repository;
+namespace Incoviba\Repository\Contabilidad;
 
 use DateTimeImmutable;
 use Incoviba\Common\Define;
 use Incoviba\Common\Ideal;
 use Incoviba\Common\Implement;
-use Incoviba\Repository;
 use Incoviba\Model;
+use Incoviba\Repository;
 
 class Deposito extends Ideal\Repository
 {
@@ -16,7 +16,7 @@ class Deposito extends Ideal\Repository
         $this->setTable('depositos');
     }
 
-    public function create(?array $data = null): Model\Deposito
+    public function create(?array $data = null): Model\Contabilidad\Deposito
     {
         $map = (new Implement\Repository\MapperParser(['id', 'capital', 'futuro']))
             ->register('cuenta_id', (new Implement\Repository\Mapper())
@@ -26,9 +26,9 @@ class Deposito extends Ideal\Repository
                 }))
             ->register('inicio', new Implement\Repository\Mapper\DateTime('inicio'))
             ->register('termino', new Implement\Repository\Mapper\DateTime('termino'));
-        return $this->parseData(new Model\Deposito(), $data, $map);
+        return $this->parseData(new Model\Contabilidad\Deposito(), $data, $map);
     }
-    public function save(Define\Model $model): Model\Deposito
+    public function save(Define\Model $model): Model\Contabilidad\Deposito
     {
         $this->saveNew([
             'id', 'cuenta_id', 'capital', 'futuro', 'inicio', 'termino'
@@ -39,7 +39,7 @@ class Deposito extends Ideal\Repository
         return $model;
     }
 
-    public function edit(Define\Model $model, array $new_data): Model\Deposito
+    public function edit(Define\Model $model, array $new_data): Model\Contabilidad\Deposito
     {
         return $this->update($model, ['cuenta_id', 'capital', 'futuro', 'inicio', 'termino'], $new_data);
     }
diff --git a/app/src/Repository/Movimiento.php b/app/src/Repository/Contabilidad/Movimiento.php
similarity index 85%
rename from app/src/Repository/Movimiento.php
rename to app/src/Repository/Contabilidad/Movimiento.php
index 48a715c..c5e6bf3 100644
--- a/app/src/Repository/Movimiento.php
+++ b/app/src/Repository/Contabilidad/Movimiento.php
@@ -1,11 +1,12 @@
 <?php
-namespace Incoviba\Repository;
+namespace Incoviba\Repository\Contabilidad;
 
 use DateTimeInterface;
 use Incoviba\Common\Define;
 use Incoviba\Common\Ideal;
 use Incoviba\Common\Implement;
 use Incoviba\Model;
+use Incoviba\Repository\Inmobiliaria;
 
 class Movimiento extends Ideal\Repository
 {
@@ -15,7 +16,7 @@ class Movimiento extends Ideal\Repository
         $this->setTable('movimientos');
     }
 
-    public function create(?array $data = null): Model\Movimiento
+    public function create(?array $data = null): Model\Contabilidad\Movimiento
     {
         $map = (new Implement\Repository\MapperParser(['cargo', 'abono', 'saldo', 'glosa', 'documento']))
             ->register('fecha', new Implement\Repository\Mapper\DateTime('fecha'))
@@ -25,9 +26,9 @@ class Movimiento extends Ideal\Repository
                     return $this->cuentaRepository->fetchById($data['cuenta_id']);
                 })
             );
-        return $this->parseData(new Model\Movimiento(), $data, $map);
+        return $this->parseData(new Model\Contabilidad\Movimiento(), $data, $map);
     }
-    public function save(Define\Model $model): Model\Movimiento
+    public function save(Define\Model $model): Model\Contabilidad\Movimiento
     {
         $model->id = $this->saveNew([
             'cuenta_id',
@@ -48,7 +49,7 @@ class Movimiento extends Ideal\Repository
         ]);
         return $model;
     }
-    public function edit(Define\Model $model, array $new_data): Model\Movimiento
+    public function edit(Define\Model $model, array $new_data): Model\Contabilidad\Movimiento
     {
         return $this->update($model, ['cuenta_id', 'fecha', 'glosa', 'documento', 'cargo', 'abono', 'saldo'], $new_data);
     }
@@ -61,7 +62,7 @@ class Movimiento extends Ideal\Repository
             ->where('cuenta_id = ? AND fecha = ?');
         return $this->fetchMany($query, [$cuenta_id, $fecha->format('Y-m-d')]);
     }
-    public function fetchByCuentaAndFechaAndCargoAndAbonoAndSaldo(int $cuenta_id, DateTimeInterface $fecha, int $cargo, int $abono, int $saldo): Model\Movimiento
+    public function fetchByCuentaAndFechaAndCargoAndAbonoAndSaldo(int $cuenta_id, DateTimeInterface $fecha, int $cargo, int $abono, int $saldo): Model\Contabilidad\Movimiento
     {
         $query = $this->connection->getQueryBuilder()
             ->select()
diff --git a/app/src/Repository/Nubox.php b/app/src/Repository/Contabilidad/Nubox.php
similarity index 82%
rename from app/src/Repository/Nubox.php
rename to app/src/Repository/Contabilidad/Nubox.php
index 3f91268..0e61748 100644
--- a/app/src/Repository/Nubox.php
+++ b/app/src/Repository/Contabilidad/Nubox.php
@@ -1,10 +1,11 @@
 <?php
-namespace Incoviba\Repository;
+namespace Incoviba\Repository\Contabilidad;
 
 use Incoviba\Common\Define;
 use Incoviba\Common\Ideal;
 use Incoviba\Common\Implement;
 use Incoviba\Model;
+use Incoviba\Repository\Inmobiliaria;
 
 class Nubox extends Ideal\Repository
 {
@@ -14,7 +15,7 @@ class Nubox extends Ideal\Repository
         $this->setTable('inmobiliarias_nubox');
     }
 
-    public function create(?array $data = null): Model\Nubox
+    public function create(?array $data = null): Model\Contabilidad\Nubox
     {
         $map = (new Implement\Repository\MapperParser(['usuario', 'alias']))
             ->register('inmobiliaria_rut', (new Implement\Repository\Mapper())
@@ -24,9 +25,9 @@ class Nubox extends Ideal\Repository
                 }))
             ->register('contraseña', (new Implement\Repository\Mapper())
                 ->setProperty('password'));
-        return $this->parseData(new Model\Nubox(), $data, $map);
+        return $this->parseData(new Model\Contabilidad\Nubox(), $data, $map);
     }
-    public function save(Define\Model $model): Model\Nubox
+    public function save(Define\Model $model): Model\Contabilidad\Nubox
     {
         $this->saveNew(
             ['inmobiliaria_rut', 'alias', 'usuario', 'contraseña'],
@@ -34,12 +35,12 @@ class Nubox extends Ideal\Repository
         );
         return $model;
     }
-    public function edit(Define\Model $model, array $new_data): Model\Nubox
+    public function edit(Define\Model $model, array $new_data): Model\Contabilidad\Nubox
     {
         return $this->update($model, ['inmobiliaria_rut', 'alias', 'usuario', 'contraseña'], $new_data);
     }
 
-    public function fetchByInmobiliaria(int $inmobiliaria_rut): Model\Nubox
+    public function fetchByInmobiliaria(int $inmobiliaria_rut): Model\Contabilidad\Nubox
     {
         $query = $this->connection->getQueryBuilder()
             ->select()
diff --git a/app/src/Repository/PagoCentroCosto.php b/app/src/Repository/Contabilidad/PagoCentroCosto.php
similarity index 80%
rename from app/src/Repository/PagoCentroCosto.php
rename to app/src/Repository/Contabilidad/PagoCentroCosto.php
index 0e2e046..b244569 100644
--- a/app/src/Repository/PagoCentroCosto.php
+++ b/app/src/Repository/Contabilidad/PagoCentroCosto.php
@@ -1,5 +1,5 @@
 <?php
-namespace Incoviba\Repository;
+namespace Incoviba\Repository\Contabilidad;
 
 use Incoviba\Common\Define;
 use Incoviba\Common\Ideal;
@@ -15,7 +15,7 @@ class PagoCentroCosto extends Ideal\Repository
         $this->setTable('pagos_centros_costos');
     }
 
-    public function create(?array $data = null): Model\PagoCentroCosto
+    public function create(?array $data = null): Model\Contabilidad\PagoCentroCosto
     {
         $map = (new Implement\Repository\MapperParser())
             ->register('pago_id', (new Implement\Repository\Mapper())
@@ -28,14 +28,14 @@ class PagoCentroCosto extends Ideal\Repository
                 ->setFunction(function(array $data) {
                     return $this->centroCostoRepository->fetchById($data['centro_costo_id']);
                 }));
-        return $this->parseData(new Model\PagoCentroCosto(), $data, $map);
+        return $this->parseData(new Model\Contabilidad\PagoCentroCosto(), $data, $map);
     }
-    public function save(Define\Model $model): Model\PagoCentroCosto
+    public function save(Define\Model $model): Model\Contabilidad\PagoCentroCosto
     {
         $model->id = $this->saveNew(['pago_id', 'centro_costo_id'], [$model->pago->id, $model->centroCosto->id]);
         return $model;
     }
-    public function edit(Define\Model $model, array $new_data): Model\PagoCentroCosto
+    public function edit(Define\Model $model, array $new_data): Model\Contabilidad\PagoCentroCosto
     {
         return $this->update($model, ['pago_id', 'centro_costo_id'], $new_data);
     }
diff --git a/app/src/Repository/TipoCentro.php b/app/src/Repository/Contabilidad/TipoCentro.php
similarity index 71%
rename from app/src/Repository/TipoCentro.php
rename to app/src/Repository/Contabilidad/TipoCentro.php
index db5bae9..2c91a39 100644
--- a/app/src/Repository/TipoCentro.php
+++ b/app/src/Repository/Contabilidad/TipoCentro.php
@@ -1,8 +1,9 @@
 <?php
-namespace Incoviba\Repository;
+namespace Incoviba\Repository\Contabilidad;
 
 use Incoviba\Common\Define;
 use Incoviba\Model;
+use Incoviba\Repository\Tipo;
 
 class TipoCentro extends Tipo
 {
@@ -14,6 +15,6 @@ class TipoCentro extends Tipo
 
     protected function getBlank(): Define\Model
     {
-        return new Model\TipoCentro();
+        return new Model\Contabilidad\TipoCentro();
     }
 }
diff --git a/app/src/Repository/Inmobiliaria.php b/app/src/Repository/Inmobiliaria.php
index 77dac3f..d42dfae 100644
--- a/app/src/Repository/Inmobiliaria.php
+++ b/app/src/Repository/Inmobiliaria.php
@@ -9,7 +9,7 @@ use Incoviba\Repository;
 
 class Inmobiliaria extends Ideal\Repository
 {
-    public function __construct(Define\Connection $connection, protected Repository\Banco $bancoRepository, protected Repository\Inmobiliaria\TipoSociedad $tipoSociedadRepository)
+    public function __construct(Define\Connection $connection, protected Contabilidad\Banco $bancoRepository, protected Repository\Inmobiliaria\TipoSociedad $tipoSociedadRepository)
     {
         parent::__construct($connection);
         $this->setTable('inmobiliaria');
diff --git a/app/src/Repository/Inmobiliaria/Cuenta.php b/app/src/Repository/Inmobiliaria/Cuenta.php
index 5005723..260e600 100644
--- a/app/src/Repository/Inmobiliaria/Cuenta.php
+++ b/app/src/Repository/Inmobiliaria/Cuenta.php
@@ -3,16 +3,15 @@ namespace Incoviba\Repository\Inmobiliaria;
 
 use Incoviba\Common\Define;
 use Incoviba\Common\Ideal;
-use Incoviba\Repository;
-use Incoviba\Model;
 use Incoviba\Common\Implement;
-use PhpParser\Node\Expr\BinaryOp\Mod;
+use Incoviba\Model;
+use Incoviba\Repository;
 
 class Cuenta extends Ideal\Repository
 {
-    public function __construct(Define\Connection $connection,
-                                protected Repository\Inmobiliaria $inmobiliariaRepository,
-                                protected Repository\Banco $bancoRepository)
+    public function __construct(Define\Connection                       $connection,
+                                protected Repository\Inmobiliaria       $inmobiliariaRepository,
+                                protected Repository\Contabilidad\Banco $bancoRepository)
     {
         parent::__construct($connection);
         $this->setTable('cuenta');
diff --git a/app/src/Repository/Movimiento/Detalle.php b/app/src/Repository/Movimiento/Detalle.php
index cdeed75..349feda 100644
--- a/app/src/Repository/Movimiento/Detalle.php
+++ b/app/src/Repository/Movimiento/Detalle.php
@@ -9,8 +9,8 @@ use Incoviba\Repository;
 
 class Detalle extends Ideal\Repository
 {
-    public function __construct(Define\Connection $connection, protected Repository\Movimiento $movimientoRepository,
-                                protected Repository\CentroCosto $centroCostoRepository)
+    public function __construct(Define\Connection                             $connection, protected Repository\Contabilidad\Movimiento $movimientoRepository,
+                                protected Repository\Contabilidad\CentroCosto $centroCostoRepository)
     {
         parent::__construct($connection);
         $this->setTable('movimientos_detalles');
diff --git a/app/src/Repository/Venta/Cuota.php b/app/src/Repository/Venta/Cuota.php
index 2a204f1..ab23319 100644
--- a/app/src/Repository/Venta/Cuota.php
+++ b/app/src/Repository/Venta/Cuota.php
@@ -1,8 +1,6 @@
 <?php
 namespace Incoviba\Repository\Venta;
 
-use PDO;
-use DateTimeImmutable;
 use Incoviba\Common\Define;
 use Incoviba\Common\Ideal;
 use Incoviba\Common\Implement;
@@ -13,10 +11,10 @@ use Incoviba\Service;
 class Cuota extends Ideal\Repository
 {
     public function __construct(
-        Define\Connection $connection,
-        protected Pie $pieRepository,
-        protected Repository\Banco $bancoRepository,
-        protected Service\Venta\Pago $pagoService
+        Define\Connection                       $connection,
+        protected Pie                           $pieRepository,
+        protected Repository\Contabilidad\Banco $bancoRepository,
+        protected Service\Venta\Pago            $pagoService
     )
     {
         parent::__construct($connection);
diff --git a/app/src/Repository/Venta/Pago.php b/app/src/Repository/Venta/Pago.php
index 4847037..0f78cc9 100644
--- a/app/src/Repository/Venta/Pago.php
+++ b/app/src/Repository/Venta/Pago.php
@@ -10,9 +10,9 @@ use Incoviba\Repository;
 class Pago extends Ideal\Repository
 {
     public function __construct(
-        Define\Connection $connection,
-        protected Repository\Banco $bancoRepository,
-        protected TipoPago $tipoPagoRepository
+        Define\Connection                       $connection,
+        protected Repository\Contabilidad\Banco $bancoRepository,
+        protected TipoPago                      $tipoPagoRepository
     )
     {
         parent::__construct($connection);
diff --git a/app/src/Service/Cartola.php b/app/src/Service/Contabilidad/Cartola.php
similarity index 83%
rename from app/src/Service/Cartola.php
rename to app/src/Service/Contabilidad/Cartola.php
index 01bda82..8b3cb76 100644
--- a/app/src/Service/Cartola.php
+++ b/app/src/Service/Contabilidad/Cartola.php
@@ -1,28 +1,27 @@
 <?php
-namespace Incoviba\Service;
+namespace Incoviba\Service\Contabilidad;
 
-use DateTimeInterface;
 use DateTimeImmutable;
-use DateInterval;
-use Psr\Http\Message\StreamFactoryInterface;
-use Psr\Http\Message\UploadedFileInterface;
-use Psr\Log\LoggerInterface;
-use Incoviba\Common\Ideal\Service;
+use DateTimeInterface;
 use Incoviba\Common\Define\Cartola\Banco;
 use Incoviba\Common\Define\Contabilidad\Exporter;
+use Incoviba\Common\Ideal\Service;
 use Incoviba\Common\Implement\Exception;
 use Incoviba\Model;
 use Incoviba\Repository;
+use Psr\Http\Message\StreamFactoryInterface;
+use Psr\Http\Message\UploadedFileInterface;
+use Psr\Log\LoggerInterface;
 
 class Cartola extends Service
 {
-    public function __construct(LoggerInterface $logger,
-                                protected StreamFactoryInterface $streamFactory, protected Exporter $exporter,
-                                protected Repository\Inmobiliaria $inmobiliariaRepository,
-                                protected Repository\Inmobiliaria\Cuenta $cuentaRepository,
-                                protected Repository\Movimiento $movimientoRepository,
-                                protected Movimiento $movimientoService,
-                                protected Repository\Cartola $cartolaRepository) {
+    public function __construct(LoggerInterface                              $logger,
+                                protected StreamFactoryInterface             $streamFactory, protected Exporter $exporter,
+                                protected Repository\Inmobiliaria            $inmobiliariaRepository,
+                                protected Repository\Inmobiliaria\Cuenta     $cuentaRepository,
+                                protected Repository\Contabilidad\Movimiento $movimientoRepository,
+                                protected Movimiento                         $movimientoService,
+                                protected Repository\Contabilidad\Cartola    $cartolaRepository) {
         parent::__construct($logger);
     }
 
@@ -32,11 +31,11 @@ class Cartola extends Service
         $this->bancos[$name] = $banco;
         return $this;
     }
-    public function process(Model\Inmobiliaria $inmobiliaria, Model\Banco $banco, DateTimeInterface $mes, UploadedFileInterface $file): array
+    public function process(Model\Inmobiliaria $inmobiliaria, Model\Contabilidad\Banco $banco, DateTimeInterface $mes, UploadedFileInterface $file): array
     {
         return $this->bancos[strtolower($banco->nombre)]->process($file);
     }
-    public function export(Model\Inmobiliaria $inmobiliaria, Model\Banco $banco, DateTimeInterface $mes, array $movimientos): string
+    public function export(Model\Inmobiliaria $inmobiliaria, Model\Contabilidad\Banco $banco, DateTimeInterface $mes, array $movimientos): string
     {
         return $this->exporter->export($inmobiliaria, $banco, $mes, $movimientos);
     }
@@ -93,13 +92,13 @@ class Cartola extends Service
         return compact('cartola', 'movimientos');
     }
 
-    protected function getMovimientosDiarios(Model\Banco $banco, UploadedFileInterface $file): array
+    protected function getMovimientosDiarios(Model\Contabilidad\Banco $banco, UploadedFileInterface $file): array
     {
         $movimientos = $this->bancos[strtolower($banco->nombre)]->process($file);
         return $this->bancos[strtolower($banco->nombre)]->processMovimientosDiarios($movimientos);
     }
     protected array $groupedMovimientos = [];
-    protected function groupMovimientoByDay(Model\Movimiento $movimiento): Cartola
+    protected function groupMovimientoByDay(Model\Contabilidad\Movimiento $movimiento): Cartola
     {
         if (!isset($this->groupedMovimientos[$movimiento->fecha->getTimestamp()])) {
             $this->groupedMovimientos[$movimiento->fecha->getTimestamp()] = [];
@@ -107,7 +106,7 @@ class Cartola extends Service
         $this->groupedMovimientos[$movimiento->fecha->getTimestamp()] []= $movimiento;
         return $this;
     }
-    protected function buildCartola(Model\Inmobiliaria\Cuenta $cuenta, DateTimeInterface $fecha, array $data): Model\Cartola
+    protected function buildCartola(Model\Inmobiliaria\Cuenta $cuenta, DateTimeInterface $fecha, array $data): Model\Contabilidad\Cartola
     {
         try {
             return $this->cartolaRepository->fetchByCuentaAndFecha($cuenta->id, $fecha);
@@ -118,7 +117,7 @@ class Cartola extends Service
             return $this->cartolaRepository->save($cartola);
         }
     }
-    protected function buildMovimiento(Model\Inmobiliaria\Cuenta $cuenta, array $data): Model\Movimiento
+    protected function buildMovimiento(Model\Inmobiliaria\Cuenta $cuenta, array $data): Model\Contabilidad\Movimiento
     {
         try {
             return $this->movimientoRepository
diff --git a/app/src/Service/Cartola/BCI.php b/app/src/Service/Contabilidad/Cartola/BCI.php
similarity index 98%
rename from app/src/Service/Cartola/BCI.php
rename to app/src/Service/Contabilidad/Cartola/BCI.php
index 470a3ce..dc3b8ab 100644
--- a/app/src/Service/Cartola/BCI.php
+++ b/app/src/Service/Contabilidad/Cartola/BCI.php
@@ -1,9 +1,9 @@
 <?php
-namespace Incoviba\Service\Cartola;
+namespace Incoviba\Service\Contabilidad\Cartola;
 
-use Psr\Http\Message\UploadedFileInterface;
-use PhpOffice\PhpSpreadsheet;
 use Incoviba\Common\Ideal\Cartola\Banco;
+use PhpOffice\PhpSpreadsheet;
+use Psr\Http\Message\UploadedFileInterface;
 
 class BCI extends Banco
 {
diff --git a/app/src/Service/Cartola/Itau.php b/app/src/Service/Contabilidad/Cartola/Itau.php
similarity index 99%
rename from app/src/Service/Cartola/Itau.php
rename to app/src/Service/Contabilidad/Cartola/Itau.php
index 5fb546a..4639ad5 100644
--- a/app/src/Service/Cartola/Itau.php
+++ b/app/src/Service/Contabilidad/Cartola/Itau.php
@@ -1,10 +1,10 @@
 <?php
-namespace Incoviba\Service\Cartola;
+namespace Incoviba\Service\Contabilidad\Cartola;
 
 use DateTimeImmutable;
-use Psr\Http\Message\UploadedFileInterface;
-use PhpOffice\PhpSpreadsheet;
 use Incoviba\Common\Ideal\Cartola\Banco;
+use PhpOffice\PhpSpreadsheet;
+use Psr\Http\Message\UploadedFileInterface;
 
 class Itau extends Banco
 {
diff --git a/app/src/Service/Cartola/Santander.php b/app/src/Service/Contabilidad/Cartola/Santander.php
similarity index 98%
rename from app/src/Service/Cartola/Santander.php
rename to app/src/Service/Contabilidad/Cartola/Santander.php
index c3108bc..8b6c7ab 100644
--- a/app/src/Service/Cartola/Santander.php
+++ b/app/src/Service/Contabilidad/Cartola/Santander.php
@@ -1,10 +1,9 @@
 <?php
-namespace Incoviba\Service\Cartola;
+namespace Incoviba\Service\Contabilidad\Cartola;
 
-use DateTimeImmutable;
-use Psr\Http\Message\UploadedFileInterface;
-use PhpOffice\PhpSpreadsheet;
 use Incoviba\Common\Ideal\Cartola\Banco;
+use PhpOffice\PhpSpreadsheet;
+use Psr\Http\Message\UploadedFileInterface;
 
 class Santander extends Banco
 {
diff --git a/app/src/Service/Cartola/Security.php b/app/src/Service/Contabilidad/Cartola/Security.php
similarity index 98%
rename from app/src/Service/Cartola/Security.php
rename to app/src/Service/Contabilidad/Cartola/Security.php
index 7f3d338..f2798b4 100644
--- a/app/src/Service/Cartola/Security.php
+++ b/app/src/Service/Contabilidad/Cartola/Security.php
@@ -1,11 +1,11 @@
 <?php
-namespace Incoviba\Service\Cartola;
+namespace Incoviba\Service\Contabilidad\Cartola;
 
-use DOMDocument;
 use DateTimeImmutable;
-use Psr\Http\Message\UploadedFileInterface;
-use PhpOffice\PhpSpreadsheet;
+use DOMDocument;
 use Incoviba\Common\Ideal\Cartola\Banco;
+use PhpOffice\PhpSpreadsheet;
+use Psr\Http\Message\UploadedFileInterface;
 
 class Security extends Banco
 {
diff --git a/app/src/Service/Contabilidad/Exporter/Nubox.php b/app/src/Service/Contabilidad/Exporter/Nubox.php
index ba32e09..69fd302 100644
--- a/app/src/Service/Contabilidad/Exporter/Nubox.php
+++ b/app/src/Service/Contabilidad/Exporter/Nubox.php
@@ -10,9 +10,9 @@ use PhpOffice\PhpSpreadsheet;
 
 class Nubox implements Exporter
 {
-    public function __construct(protected Repository\CentroCosto $centroCostoRepository, protected string $uploadFolder) {}
+    public function __construct(protected Repository\Contabilidad\CentroCosto $centroCostoRepository, protected string $uploadFolder) {}
 
-    public function export(Model\Inmobiliaria $inmobiliaria, Model\Banco $banco, DateTimeInterface $mes, array $movimientos): string
+    public function export(Model\Inmobiliaria $inmobiliaria, Model\Contabilidad\Banco $banco, DateTimeInterface $mes, array $movimientos): string
     {
         PhpSpreadsheet\Settings::setLocale('es-CL');
         $workbook = new PhpSpreadsheet\Spreadsheet();
diff --git a/app/src/Service/Contabilidad/Informe/Tesoreria.php b/app/src/Service/Contabilidad/Informe/Tesoreria.php
index 8a9f113..26460e4 100644
--- a/app/src/Service/Contabilidad/Informe/Tesoreria.php
+++ b/app/src/Service/Contabilidad/Informe/Tesoreria.php
@@ -1,23 +1,23 @@
 <?php
 namespace Incoviba\Service\Contabilidad\Informe;
 
-use DateTimeInterface;
 use DateInterval;
-use Psr\Log\LoggerInterface;
+use DateTimeInterface;
 use Incoviba\Common\Ideal;
 use Incoviba\Common\Implement;
 use Incoviba\Model;
 use Incoviba\Repository;
 use Incoviba\Service;
+use Psr\Log\LoggerInterface;
 
 class Tesoreria extends Ideal\Service
 {
     public function __construct(LoggerInterface                                        $logger,
                                 protected Repository\Inmobiliaria                      $inmobiliariaRepository,
                                 protected Service\Inmobiliaria\Cuenta                  $cuentaService,
-                                protected Repository\Deposito                          $depositoRepository,
-                                protected Repository\Cartola                           $cartolaRepository,
-                                protected Repository\Movimiento                        $movimientoRepository,
+                                protected Repository\Contabilidad\Deposito             $depositoRepository,
+                                protected Repository\Contabilidad\Cartola              $cartolaRepository,
+                                protected Repository\Contabilidad\Movimiento           $movimientoRepository,
                                 protected Service\Contabilidad\Informe\Tesoreria\Excel $excelService,
                                 protected Service\Contabilidad\Informe\Tesoreria\PDF   $pdfService)
     {
@@ -241,11 +241,11 @@ class Tesoreria extends Ideal\Service
                 try {
                     $movimientos = $this->movimientoRepository->fetchByCuentaAndFecha($cuenta->id, $fecha);
                     $this->addMovimientos(self::INGRESOS,
-                        array_filter($movimientos, function(Model\Movimiento $movimiento) {
+                        array_filter($movimientos, function(Model\Contabilidad\Movimiento $movimiento) {
                             return $movimiento->abono > 0;
                         }));
                     $this->addMovimientos(self::EGRESOS,
-                        array_filter($movimientos, function(Model\Movimiento $movimiento) {
+                        array_filter($movimientos, function(Model\Contabilidad\Movimiento $movimiento) {
                             return $movimiento->cargo > 0;
                         }));
                 } catch (Implement\Exception\EmptyResult) {}
diff --git a/app/src/Service/Movimiento.php b/app/src/Service/Contabilidad/Movimiento.php
similarity index 69%
rename from app/src/Service/Movimiento.php
rename to app/src/Service/Contabilidad/Movimiento.php
index 5d9ad67..d1f1ca3 100644
--- a/app/src/Service/Movimiento.php
+++ b/app/src/Service/Contabilidad/Movimiento.php
@@ -1,26 +1,26 @@
 <?php
-namespace Incoviba\Service;
+namespace Incoviba\Service\Contabilidad;
 
-use DateTimeInterface;
-use Psr\Log\LoggerInterface;
 use Incoviba\Common\Ideal\Service;
 use Incoviba\Common\Implement;
-use Incoviba\Repository;
 use Incoviba\Model;
+use Incoviba\Repository;
+use Psr\Log\LoggerInterface;
 
 class Movimiento extends Service
 {
-    public function __construct(LoggerInterface $logger, protected Repository\Movimiento $movimientoRepository,
+    public function __construct(LoggerInterface                         $logger,
+                                protected Repository\Contabilidad\Movimiento $movimientoRepository,
                                 protected Repository\Movimiento\Detalle $detalleRepository)
     {
         parent::__construct($logger);
     }
 
-    public function getById(int $movimiento_id): Model\Movimiento
+    public function getById(int $movimiento_id): Model\Contabilidad\Movimiento
     {
         return $this->process($this->movimientoRepository->fetchById($movimiento_id));
     }
-    public function setDetalles(Model\Movimiento $movimiento, array $data): Model\Movimiento
+    public function setDetalles(Model\Contabilidad\Movimiento $movimiento, array $data): Model\Contabilidad\Movimiento
     {
         try {
             $detalles = $this->detalleRepository->fetchByMovimiento($movimiento->id);
@@ -33,7 +33,7 @@ class Movimiento extends Service
         return $movimiento;
     }
 
-    public function process(Model\Movimiento $movimiento): Model\Movimiento
+    public function process(Model\Contabilidad\Movimiento $movimiento): Model\Contabilidad\Movimiento
     {
         $movimiento->addFactory('detalles', (new Implement\Repository\Factory())->setCallable(function(int $movimiento_id) {
             return $this->detalleRepository->fetchByMovimiento($movimiento_id);
diff --git a/app/src/Service/Contabilidad/Nubox.php b/app/src/Service/Contabilidad/Nubox.php
index 2d880cf..62bdf48 100644
--- a/app/src/Service/Contabilidad/Nubox.php
+++ b/app/src/Service/Contabilidad/Nubox.php
@@ -2,24 +2,24 @@
 namespace Incoviba\Service\Contabilidad;
 
 use DateTimeInterface;
+use Incoviba\Common\Ideal;
+use Incoviba\Common\Implement\Exception;
+use Incoviba\Repository;
+use Incoviba\Service;
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
 use Psr\Log\LoggerInterface;
-use Incoviba\Common\Implement\Exception;
-use Incoviba\Repository;
-use Incoviba\Service;
-use Incoviba\Common\Ideal;
 
 class Nubox extends Ideal\Service
 {
-    public function __construct(protected LoggerInterface $logger,
-                                protected Repository\Nubox $nuboxRepository,
-                                protected Service\Redis $redisService,
-                                protected ClientInterface $client,
-                                protected RequestFactoryInterface $requestFactory,
-                                protected string $api_url)
+    public function __construct(protected LoggerInterface               $logger,
+                                protected Repository\Contabilidad\Nubox $nuboxRepository,
+                                protected Service\Redis                 $redisService,
+                                protected ClientInterface               $client,
+                                protected RequestFactoryInterface       $requestFactory,
+                                protected string                        $api_url)
     {
         parent::__construct($logger);
     }