diff --git a/content/applications/finance/accounting.rst b/content/applications/finance/accounting.rst
index 40c2691c1..037f492fc 100644
--- a/content/applications/finance/accounting.rst
+++ b/content/applications/finance/accounting.rst
@@ -1,7 +1,4 @@
-:nosearch:
 :show-content:
-:hide-page-toc:
-:show-toc:
 
 ========================
 Accounting and Invoicing
@@ -15,17 +12,188 @@ development with features such as AI-powered invoice recognition, synchronizatio
 accounts, smart matching suggestions, etc.
 
 .. seealso::
-   - `Odoo Tutorials: Accounting <https://www.odoo.com/slides/accounting-19>`_
-   - :doc:`Accounting Cheat Sheet <accounting/getting_started/cheat_sheet>`
+   `Odoo Tutorials: Accounting <https://www.odoo.com/slides/accounting-19>`_
 
+.. cards::
+
+   .. card:: Get started
+      :target: accounting/get_started
+      :large:
+
+      Basic concepts of accounting and initial setup of your accounting
+
+   .. card:: Taxes
+      :target: accounting/taxes
+
+      Taxes, fiscal positions, and integrations
+
+   .. card:: Customer invoices
+      :target: accounting/customer_invoices
+
+      Customer invoices, payment terms, and electronic invoicing
+
+   .. card:: Vendor bills
+      :target: accounting/vendor_bills
+
+      Vendor bills, assets, and invoice digitization (OCR)
+
+   .. card:: Payments
+      :target: accounting/payments
+
+      Invoices and bills payments (online, checks, batches) and follow-up on invoices
+
+   .. card:: Bank and cash accounts
+      :target: accounting/bank
+
+      Bank synchronization, reconciliation, and cash registers
+
+   .. card:: Reporting
+      :target: accounting/reporting
+
+      Reporting, declarations, and analytic accounting
+
+Double-entry bookkeeping
+========================
+
+Odoo automatically creates all the behind-the-scenes journal entries
+for each of your accounting transactions: customer invoices, point of
+sale order, expenses, inventory moves, etc.
+
+Odoo uses the rules of double-entry bookkeeping system: all journal
+entries are automatically balanced (sum of debits = sum of credits).
+
+.. seealso::
+   - :doc:`Understand Odoo's accounting transactions per document
+     <accounting/get_started/cheat_sheet>`
+
+Accrual and Cash Basis Methods
+==============================
+
+Odoo supports both accrual and cash basis reporting. This allows you to
+report income / expense at the time transactions occur (i.e., accrual basis), or when
+payment is made or received (i.e., cash basis).
+
+Multi-companies
+===============
+
+Odoo allows one to manage several companies within the same database. Each
+company has its own chart of accounts and rules. You can get
+consolidation reports following your consolidation rules.
+
+Users can access several companies but always work in one company at a
+time.
+
+Multi-currencies
+================
+
+Every transaction is recorded in the default currency of the
+company. For transactions occurring in another currency, Odoo stores
+both the value in the currency of the company and the value in the
+currency of the transaction. Odoo can generate currencies gains and
+losses after the reconciliation of the journal items.
+
+Currency rates are updated once a day using a yahoo.com online
+web-service.
+
+International Standards
+=======================
+
+Odoo accounting supports more than 50 countries. The Odoo core
+accounting implements accounting standards that are common to all
+countries. Specific modules exist per country for the
+specificities of the country like the chart of accounts, taxes, or
+bank interfaces.
+
+In particular, Odoo's core accounting engine supports:
+
+* Anglo-Saxon Accounting (U.S., U.K.,, and other English-speaking
+  countries including Ireland, Canada, Australia, and New Zealand)
+  where costs of good sold are reported when products are
+  sold/delivered.
+* European accounting where expenses are accounted at the supplier
+  bill.
+
+Odoo has modules to comply with IFRS rules.
+
+Accounts Receivable and Payable
+===============================
+
+By default, Odoo uses a single account for all account
+receivable entries and one for all accounts payable entries. You can
+create separate accounts per customers/suppliers, but you don't need
+to.
+
+As transactions are associated to customers or suppliers, you get
+reports to perform analysis per customer/supplier such as the customer
+statement, revenues per customers, aged receivable/payables, ...
+
+Wide range of financial reports
+===============================
+
+In Odoo, you can generate financial reports in real time. Odoo's
+reports range from basic accounting reports to advanced management
+reports. Odoo's reports include:
+
+* Performance reports (such as Profit and Loss, Budget Variance)
+* Position reports (such as Balance Sheet, Aged Payables, Aged
+  Receivables)
+* Cash reports (such as Bank Summary)
+* Detail reports (such as Trial Balance and General Ledger)
+* Management reports (such as Budgets, Executive Summary)
+
+Odoo's report engine allows you to customize your own report based on
+your own formulae.
+
+Import bank feeds automatically
+===============================
+
+Bank reconciliation is a process that matches your bank statement
+lines, as supplied by the bank, to your accounting transactions in the
+general ledger. Odoo makes bank reconciliation easy by frequently
+importing bank statement lines from your bank directly into your Odoo
+account. This means you can have a daily view of your cashflow without
+having to log into your online banking or wait for your paper bank
+statements.
+
+Odoo speeds up bank reconciliation by matching most of your imported
+bank statement lines to your accounting transactions. Odoo also
+remembers how you've treated other bank statement lines and provides
+suggested general ledger transactions.
+
+Calculate the tax you owe your tax authority
+============================================
+
+Odoo totals all your accounting transactions for your tax period and
+uses these totals to calculate your tax obligation. You can then check
+your sales tax by running Odoo's Tax Report.
+
+Inventory Valuation
+===================
+
+Odoo support both periodic (manual) and perpetual (automated)
+inventory valuations. The available methods are standard price,
+average price, LIFO (for countries allowing it) and FIFO.
+
+.. seealso::
+   - :doc:`View impact of the valuation method on your transactions
+     </applications/inventory_and_mrp/inventory/management/reporting/inventory_valuation_config>`
+
+Easy retained earnings
+======================
+
+Retained earnings are the portion of income retained by your
+business. Odoo automatically calculates your current year earnings in
+real time so no year-end journal or rollover is required.  This is
+calculated by reporting the profit and loss balance to your balance
+sheet report automatically.
 
 .. toctree::
    :titlesonly:
 
-   accounting/getting_started
-   accounting/receivables
-   accounting/payables
+   accounting/get_started
+   accounting/taxes
+   accounting/customer_invoices
+   accounting/vendor_bills
+   accounting/payments
    accounting/bank
-   accounting/taxation
    accounting/reporting
-   accounting/others
diff --git a/content/applications/finance/accounting/bank.rst b/content/applications/finance/accounting/bank.rst
index 484e8c912..de2c09f97 100644
--- a/content/applications/finance/accounting/bank.rst
+++ b/content/applications/finance/accounting/bank.rst
@@ -1,14 +1,193 @@
-:nosearch:
+:show-content:
 
+======================
+Bank and cash accounts
+======================
+
+You can manage as many bank or cash accounts as needed on your database. Configuring them well
+allows you to have all your banking data up-to-date and ready for :doc:`reconciliation
+<bank/reconciliation>` with your journal entries.
+
+In Odoo Accounting, each bank account has a dedicated journal set to post all entries in a dedicated
+account. Both the journal and the account are automatically created and configured whenever you add
+a bank account.
+
+.. note::
+   Cash journals and accounts must be configured manually.
+
+Bank journals are displayed by default on the :guilabel:`Accounting Dashboard` in the form of cards
+which include action buttons.
+
+.. image:: bank/card.png
+   :alt: Bank journals are displayed on the Accounting Dashboard and contain action buttons
+
+.. _bank_accounts/manage:
+
+Manage your bank and cash accounts
+==================================
+
+Connect your bank for automatic synchronization
+-----------------------------------------------
+
+To connect your bank account to your database, go to :menuselection:`Accounting --> Configuration
+--> Banks: Add a Bank Account`, select your bank in the list, click on :guilabel:`Connect`, and
+follow the instructions.
+
+.. seealso::
+   :doc:`bank/bank_synchronization`
+
+Create a bank account
+---------------------
+
+If your banking institution is not available in Odoo, or if you don't want to connect your bank
+account to your database, you can configure your bank account manually.
+
+To manually add a bank account, go to :menuselection:`Accounting --> Configuration --> Banks:
+Add a Bank Account`, click on :guilabel:`Create it` (at the bottom right), and fill out the form.
+
+.. note::
+   - Odoo automatically detects the bank account type (e.g., IBAN) and enables some features
+     accordingly.
+   - A default bank journal is available and can be used to configure your bank account by going to
+     :menuselection:`Accounting --> Configuration --> Accounting: Journals --> Bank`. Open it and
+     edit the different fields to match your bank account information.
+
+Create a cash journal
+---------------------
+
+To create a new cash journal, go to :menuselection:`Accounting --> Configuration --> Accounting:
+Journals`, click on :guilabel:`Create` and select :guilabel:`Cash` in the :guilabel:`Type` field.
+
+For more information on the accounting information fields, read the
+:ref:`bank_accounts/configuration` section of this page.
+
+.. note::
+   A default cash journal is available and can be used straight away. You can review it by going to
+   :menuselection:`Accounting --> Configuration --> Accounting: Journals --> Cash`.
+
+Edit an existing bank or cash journal
+-------------------------------------
+
+To edit an existing bank journal, go to :menuselection:`Accounting --> Configuration --> Accounting:
+Journals` and select the journal you want to modify.
+
+.. _bank_accounts/configuration:
+
+Configuration
 =============
-Bank and cash
-=============
+
+You can edit the accounting information and bank account number according to your needs.
+
+.. image:: bank/bank-journal-config.png
+   :alt: Manually configure your bank information
+
+.. seealso::
+   - :doc:`get_started/multi_currency`
+   - :doc:`bank/bank_statements`
+
+Suspense account
+----------------
+
+Bank statement transactions are posted on the :guilabel:`Suspense Account` until the final
+reconciliation allows finding the right account.
+
+Profit and loss accounts
+------------------------
+
+The :guilabel:`Profit Account` is used to register a profit when the ending balance of a cash
+register differs from what the system computes, while the :guilabel:`Loss Account` is used to
+register a loss when the ending balance of a cash register differs from what the system computes.
+
+Currency
+--------
+
+You can edit the currency used to enter the statements.
+
+.. seealso::
+   :doc:`get_started/multi_currency`
+
+Account number
+--------------
+
+If you need to **edit your bank account details**, click on the external link arrow next to your
+:guilabel:`Account Number`. On the new page, click on the external link arrow next to your
+:guilabel:`Bank` and update your bank information accordingly. These details are used when
+registering payments.
+
+.. image:: bank/bank-account-number.png
+   :alt: Edit your bank information
+
+Bank feeds
+----------
+
+:guilabel:`Bank Feeds` defines how the bank statements are registered. Three options are available:
+
+- :guilabel:`Undefined yet`, which should be selected when you don’t know yet if you will
+  synchronize your bank account with your database or not.
+- :guilabel:`Import (CAMT, CODA, CSV, OFX, QIF)`, which should be selected if you want to import
+  your bank statement using a different format.
+- :guilabel:`Automated Bank Synchronization`, which should be selected if your bank is synchronized
+  with your database.
+
+.. seealso::
+   - :doc:`bank/bank_synchronization`
+   - :doc:`bank/bank_statements`
+
+.. _bank/outstanding-accounts:
+
+Outstanding accounts
+====================
+
+By default, payments are registered through transitory accounts named **outstanding accounts**,
+before being recorded in your bank account.
+
+- An **outstanding payments account** is where outgoing payments are posted until they are linked
+  with a withdrawal from your bank statement.
+- An **outstanding receipts account** is where incoming payments are posted until they are linked
+  with a deposit from your bank statement.
+
+These accounts should be of :ref:`type <chart-of-account/type>` :guilabel:`Current Assets`.
+
+.. note::
+   The movement from an outstanding account to a bank account is done automatically when you
+   reconcile the bank account with a bank statement.
+
+Default accounts configuration
+------------------------------
+
+The outstanding accounts are defined by default. If necessary, you can update them by going to
+:menuselection:`Accounting --> Configuration --> Settings --> Default Accounts` and update your
+:guilabel:`Outstanding Receipts Account` and :guilabel:`Outstanding Payments Account`.
+
+Bank and cash journals configuration
+------------------------------------
+
+You can also set specific outstanding accounts for any journal with the :ref:`type
+<chart-of-account/type>` :guilabel:`Bank` or :guilabel:`Cash`.
+
+From your :guilabel:`Accounting Dashboard`, click on the menu selection ⋮ of the journal you want to
+configure, and click on :guilabel:`Configuration`, then open the :guilabel:`Incoming/Outgoing
+Payments` tab. To display the outstanding accounts column, click on the toggle button and check the
+:guilabel:`Outstanding Receipts/Payments accounts`, then update the account.
+
+.. image:: bank/toggle-button.png
+   :align: center
+   :alt: Select the toggle button and click on outstanding Accounts
+
+.. note::
+   - If you do not specify an outstanding payments account or an outstanding receipts account for a
+     specific journal, Odoo uses the default outstanding accounts.
+   - If your main bank account is added as an outstanding receipts account or outstanding payments
+     account, when a payment is registered, the invoice or bill's status is directly set to
+     :guilabel:`Paid`.
 
 .. toctree::
    :titlesonly:
 
-   bank/setup
    bank/bank_synchronization
    bank/bank_statements
    bank/reconciliation
-   bank/interbank
+   bank/reconciliation_cash
+   bank/reconciliation_models
+   bank/foreign_currency
+   bank/cash_register
diff --git a/content/applications/finance/accounting/bank/setup/bank_accounts/bank-account-number.png b/content/applications/finance/accounting/bank/bank-account-number.png
similarity index 100%
rename from content/applications/finance/accounting/bank/setup/bank_accounts/bank-account-number.png
rename to content/applications/finance/accounting/bank/bank-account-number.png
diff --git a/content/applications/finance/accounting/bank/setup/bank_accounts/bank-journal-config.png b/content/applications/finance/accounting/bank/bank-journal-config.png
similarity index 100%
rename from content/applications/finance/accounting/bank/setup/bank_accounts/bank-journal-config.png
rename to content/applications/finance/accounting/bank/bank-journal-config.png
diff --git a/content/applications/finance/accounting/bank/setup/bank_accounts/card.png b/content/applications/finance/accounting/bank/card.png
similarity index 100%
rename from content/applications/finance/accounting/bank/setup/bank_accounts/card.png
rename to content/applications/finance/accounting/bank/card.png
diff --git a/content/applications/finance/accounting/bank/setup/manage_cash_register.rst b/content/applications/finance/accounting/bank/cash_register.rst
similarity index 86%
rename from content/applications/finance/accounting/bank/setup/manage_cash_register.rst
rename to content/applications/finance/accounting/bank/cash_register.rst
index 365ad2b13..8f73141c2 100644
--- a/content/applications/finance/accounting/bank/setup/manage_cash_register.rst
+++ b/content/applications/finance/accounting/bank/cash_register.rst
@@ -1,6 +1,6 @@
-======================
-Manage a cash register
-======================
+=============
+Cash register
+=============
 
 The cash register is a journal to register receivings and payments transactions.
 It calculates the total money in and out, computing the total balance.
@@ -8,7 +8,7 @@ It calculates the total money in and out, computing the total balance.
 Configuration
 =============
 
-.. image:: manage_cash_register/journal.png
+.. image:: cash_register/journal.png
    :align: center
 
 1. Configure the Cash journal in :menuselection:`Accounting --> Configuration -->
@@ -40,7 +40,7 @@ Put money in is used to placed your cash manually before starting your
 transactions. From the Register Transactions window, go to :menuselection:`More
 --> Put money in`
 
-.. image:: manage_cash_register/put-money-in.png
+.. image:: cash_register/put-money-in.png
    :align: center
 
 Take money out
@@ -50,7 +50,7 @@ Take money out is used to collect/get yor your cash manually after
 ending all your transactions. From the Register Transaction windows, go to :menuselection:`More
 --> Take money out`
 
-.. image:: manage_cash_register/put-money-out.png
+.. image:: cash_register/put-money-out.png
    :align: center
 
 The transactions will be added to the current cash payment registration.
diff --git a/content/applications/finance/accounting/bank/setup/manage_cash_register/journal.png b/content/applications/finance/accounting/bank/cash_register/journal.png
similarity index 100%
rename from content/applications/finance/accounting/bank/setup/manage_cash_register/journal.png
rename to content/applications/finance/accounting/bank/cash_register/journal.png
diff --git a/content/applications/finance/accounting/bank/setup/manage_cash_register/put-money-in.png b/content/applications/finance/accounting/bank/cash_register/put-money-in.png
similarity index 100%
rename from content/applications/finance/accounting/bank/setup/manage_cash_register/put-money-in.png
rename to content/applications/finance/accounting/bank/cash_register/put-money-in.png
diff --git a/content/applications/finance/accounting/bank/setup/manage_cash_register/put-money-out.png b/content/applications/finance/accounting/bank/cash_register/put-money-out.png
similarity index 100%
rename from content/applications/finance/accounting/bank/setup/manage_cash_register/put-money-out.png
rename to content/applications/finance/accounting/bank/cash_register/put-money-out.png
diff --git a/content/applications/finance/accounting/bank/setup/foreign_currency.rst b/content/applications/finance/accounting/bank/foreign_currency.rst
similarity index 100%
rename from content/applications/finance/accounting/bank/setup/foreign_currency.rst
rename to content/applications/finance/accounting/bank/foreign_currency.rst
diff --git a/content/applications/finance/accounting/bank/setup/foreign_currency/foreign-adjustment.png b/content/applications/finance/accounting/bank/foreign_currency/foreign-adjustment.png
similarity index 100%
rename from content/applications/finance/accounting/bank/setup/foreign_currency/foreign-adjustment.png
rename to content/applications/finance/accounting/bank/foreign_currency/foreign-adjustment.png
diff --git a/content/applications/finance/accounting/bank/setup/foreign_currency/foreign-bill-currency.png b/content/applications/finance/accounting/bank/foreign_currency/foreign-bill-currency.png
similarity index 100%
rename from content/applications/finance/accounting/bank/setup/foreign_currency/foreign-bill-currency.png
rename to content/applications/finance/accounting/bank/foreign_currency/foreign-bill-currency.png
diff --git a/content/applications/finance/accounting/bank/setup/foreign_currency/foreign-exchange-rates.png b/content/applications/finance/accounting/bank/foreign_currency/foreign-exchange-rates.png
similarity index 100%
rename from content/applications/finance/accounting/bank/setup/foreign_currency/foreign-exchange-rates.png
rename to content/applications/finance/accounting/bank/foreign_currency/foreign-exchange-rates.png
diff --git a/content/applications/finance/accounting/bank/setup/foreign_currency/foreign-gains-losses.png b/content/applications/finance/accounting/bank/foreign_currency/foreign-gains-losses.png
similarity index 100%
rename from content/applications/finance/accounting/bank/setup/foreign_currency/foreign-gains-losses.png
rename to content/applications/finance/accounting/bank/foreign_currency/foreign-gains-losses.png
diff --git a/content/applications/finance/accounting/bank/setup/foreign_currency/foreign-journal.png b/content/applications/finance/accounting/bank/foreign_currency/foreign-journal.png
similarity index 100%
rename from content/applications/finance/accounting/bank/setup/foreign_currency/foreign-journal.png
rename to content/applications/finance/accounting/bank/foreign_currency/foreign-journal.png
diff --git a/content/applications/finance/accounting/bank/setup/foreign_currency/foreign-reset-rates.png b/content/applications/finance/accounting/bank/foreign_currency/foreign-reset-rates.png
similarity index 100%
rename from content/applications/finance/accounting/bank/setup/foreign_currency/foreign-reset-rates.png
rename to content/applications/finance/accounting/bank/foreign_currency/foreign-reset-rates.png
diff --git a/content/applications/finance/accounting/bank/reconciliation.rst b/content/applications/finance/accounting/bank/reconciliation.rst
index 9e4dc198b..7a942425f 100644
--- a/content/applications/finance/accounting/bank/reconciliation.rst
+++ b/content/applications/finance/accounting/bank/reconciliation.rst
@@ -1,12 +1,95 @@
-:nosearch:
-
 ===================
 Bank reconciliation
 ===================
 
-.. toctree::
-   :titlesonly:
+Overview
+========
 
-   reconciliation/cash_transactions
-   reconciliation/use_cases
-   reconciliation/reconciliation_models
+Matching your bank statements with your accounting records can be a tedious task. You need to find the corresponding invoices, compare the amounts and partners' details with those in the bank statement. These steps can take a lot of time. Luckily, with Odoo you can very easily match your invoices or any other payment document with your bank statements.
+
+Two options of the reconciliation process exist in Odoo.
+
+1. We can directly specify the payment on the invoice
+2. We can reconcile open invoices with bank statements
+
+Configuration
+=============
+
+No special configuration is necessary to record invoices. All we need
+to do is to install the accounting app.
+
+.. image:: reconciliation/use01.png
+
+Use cases
+=========
+
+Case 1: Payments registration
+-----------------------------
+
+We received the proof of payment of our invoice in the amount of 2100 euros issued to
+Smith & Co.
+
+We start at our issued Invoice of 2100 euros for Smith & Co. Because the
+sold product is a service we demand an immediate payment. Our accountant
+only handles bank statements at the end of week, so we have to mark
+this invoice as paid immediately in order to indicate that we can start rendering services to our
+customer.
+
+Our customer send us a payment confirmation. We can thus register a
+payment and mark the invoice as paid.
+
+.. image:: reconciliation/use02.png
+
+By clicking on **register payment,** we are telling Odoo that our
+customer has paid the Invoice. We thus have to specify the amount and the
+payment method.
+
+.. image:: reconciliation/use03.png
+
+Now we can always find the payment details in the Invoice by clicking on the
+:menuselection:`Info --> Open Payment`.
+
+.. image:: reconciliation/use04.png
+
+The invoice has been paid and **the reconciliation has been done
+automatically.**
+
+Case 2: Bank statements reconciliations
+---------------------------------------
+
+We start at our issued Invoice of 3000 euros for Smith & Co. Let's also
+assume that other Invoices are open for different customers.
+
+.. image:: reconciliation/use05.png
+
+We receive our bank statement and find that not only the invoice issued to Smith & Co has
+been paid, but the one to Buzz of 92 euros as well.
+
+**Import** or **Create** the bank statements. Please refer to the
+documents from the Bank Feeds section.
+
+.. image:: reconciliation/use06.png
+
+On the dashboard, click on **Reconcile # Items**
+
+.. image:: reconciliation/use07.png
+
+If everything was right (correct partner name, right amount) odoo will
+do the reconciliations **automatically**.
+
+.. image:: reconciliation/use08.png
+
+If some issues are found, you will need to take **manual actions**.
+
+For example, if the partner is missing from your bank statement, just
+fill it in :
+
+.. image:: reconciliation/use09.png
+
+If the payment is done with a down payment, just check if it is all
+right and validate all related payments :
+
+.. image:: reconciliation/use10.png
+
+.. seealso::
+   :doc:`bank_synchronization`
diff --git a/content/applications/finance/accounting/bank/reconciliation/use_cases/use01.png b/content/applications/finance/accounting/bank/reconciliation/use01.png
similarity index 100%
rename from content/applications/finance/accounting/bank/reconciliation/use_cases/use01.png
rename to content/applications/finance/accounting/bank/reconciliation/use01.png
diff --git a/content/applications/finance/accounting/bank/reconciliation/use_cases/use02.png b/content/applications/finance/accounting/bank/reconciliation/use02.png
similarity index 100%
rename from content/applications/finance/accounting/bank/reconciliation/use_cases/use02.png
rename to content/applications/finance/accounting/bank/reconciliation/use02.png
diff --git a/content/applications/finance/accounting/bank/reconciliation/use_cases/use03.png b/content/applications/finance/accounting/bank/reconciliation/use03.png
similarity index 100%
rename from content/applications/finance/accounting/bank/reconciliation/use_cases/use03.png
rename to content/applications/finance/accounting/bank/reconciliation/use03.png
diff --git a/content/applications/finance/accounting/bank/reconciliation/use_cases/use04.png b/content/applications/finance/accounting/bank/reconciliation/use04.png
similarity index 100%
rename from content/applications/finance/accounting/bank/reconciliation/use_cases/use04.png
rename to content/applications/finance/accounting/bank/reconciliation/use04.png
diff --git a/content/applications/finance/accounting/bank/reconciliation/use_cases/use05.png b/content/applications/finance/accounting/bank/reconciliation/use05.png
similarity index 100%
rename from content/applications/finance/accounting/bank/reconciliation/use_cases/use05.png
rename to content/applications/finance/accounting/bank/reconciliation/use05.png
diff --git a/content/applications/finance/accounting/bank/reconciliation/use_cases/use06.png b/content/applications/finance/accounting/bank/reconciliation/use06.png
similarity index 100%
rename from content/applications/finance/accounting/bank/reconciliation/use_cases/use06.png
rename to content/applications/finance/accounting/bank/reconciliation/use06.png
diff --git a/content/applications/finance/accounting/bank/reconciliation/use_cases/use07.png b/content/applications/finance/accounting/bank/reconciliation/use07.png
similarity index 100%
rename from content/applications/finance/accounting/bank/reconciliation/use_cases/use07.png
rename to content/applications/finance/accounting/bank/reconciliation/use07.png
diff --git a/content/applications/finance/accounting/bank/reconciliation/use_cases/use08.png b/content/applications/finance/accounting/bank/reconciliation/use08.png
similarity index 100%
rename from content/applications/finance/accounting/bank/reconciliation/use_cases/use08.png
rename to content/applications/finance/accounting/bank/reconciliation/use08.png
diff --git a/content/applications/finance/accounting/bank/reconciliation/use_cases/use09.png b/content/applications/finance/accounting/bank/reconciliation/use09.png
similarity index 100%
rename from content/applications/finance/accounting/bank/reconciliation/use_cases/use09.png
rename to content/applications/finance/accounting/bank/reconciliation/use09.png
diff --git a/content/applications/finance/accounting/bank/reconciliation/use_cases/use10.png b/content/applications/finance/accounting/bank/reconciliation/use10.png
similarity index 100%
rename from content/applications/finance/accounting/bank/reconciliation/use_cases/use10.png
rename to content/applications/finance/accounting/bank/reconciliation/use10.png
diff --git a/content/applications/finance/accounting/bank/reconciliation/use_cases.rst b/content/applications/finance/accounting/bank/reconciliation/use_cases.rst
deleted file mode 100644
index 9bc891cb7..000000000
--- a/content/applications/finance/accounting/bank/reconciliation/use_cases.rst
+++ /dev/null
@@ -1,105 +0,0 @@
-=======================================
-Bank reconciliation process - use cases
-=======================================
-
-Overview
-========
-
-Matching your bank statements with your accounting records can be a tedious task. You need to find the corresponding invoices, compare the amounts and partners' details with those in the bank statement. These steps can take a lot of time. Luckily, with Odoo you can very easily match your invoices or any other payment document with your bank statements.
-
-Two options of the reconciliation process exist in Odoo.
-
-1. We can directly specify the payment on the invoice
-2. We can reconcile open invoices with bank statements
-
-Configuration
-=============
-
-No special configuration is necessary to record invoices. All we need
-to do is to install the accounting app.
-
-.. image:: use_cases/use01.png
-   :align: center
-
-Use cases
-=========
-
-Case 1: Payments registration
------------------------------
-
-We received the proof of payment of our invoice in the amount of 2100 euros issued to
-Smith & Co.
-
-We start at our issued Invoice of 2100 euros for Smith & Co. Because the
-sold product is a service we demand an immediate payment. Our accountant
-only handles bank statements at the end of week, so we have to mark
-this invoice as paid immediately in order to indicate that we can start rendering services to our
-customer.
-
-Our customer send us a payment confirmation. We can thus register a
-payment and mark the invoice as paid.
-
-.. image:: use_cases/use02.png
-   :align: center
-
-By clicking on **register payment,** we are telling Odoo that our
-customer has paid the Invoice. We thus have to specify the amount and the
-payment method.
-
-.. image:: use_cases/use03.png
-   :align: center
-
-Now we can always find the payment details in the Invoice by clicking on the
-:menuselection:`Info --> Open Payment`.
-
-.. image:: use_cases/use04.png
-   :align: center
-
-The invoice has been paid and **the reconciliation has been done
-automatically.**
-
-Case 2: Bank statements reconciliations
----------------------------------------
-
-We start at our issued Invoice of 3000 euros for Smith & Co. Let's also
-assume that other Invoices are open for different customers.
-
-.. image:: use_cases/use05.png
-   :align: center
-
-We receive our bank statement and find that not only the invoice issued to Smith & Co has
-been paid, but the one to Buzz of 92 euros as well.
-
-**Import** or **Create** the bank statements. Please refer to the
-documents from the Bank Feeds section.
-
-.. image:: use_cases/use06.png
-   :align: center
-
-On the dashboard, click on **Reconcile # Items**
-
-.. image:: use_cases/use07.png
-   :align: center
-
-If everything was right (correct partner name, right amount) odoo will
-do the reconciliations **automatically**.
-
-.. image:: use_cases/use08.png
-   :align: center
-
-If some issues are found, you will need to take **manual actions**.
-
-For example, if the partner is missing from your bank statement, just
-fill it in :
-
-.. image:: use_cases/use09.png
-   :align: center
-
-If the payment is done with a down payment, just check if it is all
-right and validate all related payments :
-
-.. image:: use_cases/use10.png
-   :align: center
-
-.. seealso::
-   :doc:`../bank_synchronization`
diff --git a/content/applications/finance/accounting/bank/reconciliation/cash_transactions.rst b/content/applications/finance/accounting/bank/reconciliation_cash.rst
similarity index 92%
rename from content/applications/finance/accounting/bank/reconciliation/cash_transactions.rst
rename to content/applications/finance/accounting/bank/reconciliation_cash.rst
index e29f9a37b..0ebe18bfd 100644
--- a/content/applications/finance/accounting/bank/reconciliation/cash_transactions.rst
+++ b/content/applications/finance/accounting/bank/reconciliation_cash.rst
@@ -8,7 +8,7 @@ reconciled with a bank statement. It is possible to :ref:`bypass <cash-reconcili
 *In Payment* status for cash transactions, therefore removing the need to reconcile with a bank
 statement.
 
-.. image:: cash_transactions/cash-inpayment-status.png
+.. image:: reconciliation_cash/cash-inpayment-status.png
    :align: center
    :alt: In Payment status of invoice or bill.
 
@@ -18,7 +18,7 @@ Cash logs
 At the start of each day, create a **cash log**. To do so, go to your :guilabel:`Accounting
 Dashboard` and click :guilabel:`New Transaction` in the :guilabel:`Cash` journal.
 
-.. image:: cash_transactions/new-transaction.png
+.. image:: reconciliation_cash/new-transaction.png
    :align: center
    :alt: Create a new cash log.
 
@@ -27,7 +27,7 @@ Create your invoice by going to :menuselection:`Accounting dashboard --> Custome
 confirm it. Click :guilabel:`Register Payment` and select the cash :guilabel:`Journal`. Repeat the
 process for each invoice.
 
-.. image:: cash_transactions/cash-payment-journal.png
+.. image:: reconciliation_cash/cash-payment-journal.png
    :align: center
    :alt: Select Cash journal upon payment registration.
 
@@ -49,7 +49,7 @@ created earlier. To be able to match all cash payments, make sure no **partner**
 partner. Then, pair (or match) each cash payment with your cash log by clicking on the payment in
 the :guilabel:`Customer/Vendor Matching`, and :guilabel:`validate`.
 
-.. image:: cash_transactions/cash-payment-reconciliation.png
+.. image:: reconciliation_cash/cash-payment-reconciliation.png
    :align: center
    :alt: Cash payments reconciliation.
 
@@ -73,7 +73,7 @@ Configuration` tab and set a `Cash` account in both the :guilabel:`Outstanding R
 :guilabel:`Outstanding Payments Account` fields, then save. Payments registered in the **cash**
 journal now bypass the *In Payment* status.
 
-.. image:: cash_transactions/cash-payments-config.png
+.. image:: reconciliation_cash/cash-payments-config.png
    :align: center
    :alt: Configuration tab of the cash journal.
 
diff --git a/content/applications/finance/accounting/bank/reconciliation/cash_transactions/cash-inpayment-status.png b/content/applications/finance/accounting/bank/reconciliation_cash/cash-inpayment-status.png
similarity index 100%
rename from content/applications/finance/accounting/bank/reconciliation/cash_transactions/cash-inpayment-status.png
rename to content/applications/finance/accounting/bank/reconciliation_cash/cash-inpayment-status.png
diff --git a/content/applications/finance/accounting/bank/reconciliation/cash_transactions/cash-payment-journal.png b/content/applications/finance/accounting/bank/reconciliation_cash/cash-payment-journal.png
similarity index 100%
rename from content/applications/finance/accounting/bank/reconciliation/cash_transactions/cash-payment-journal.png
rename to content/applications/finance/accounting/bank/reconciliation_cash/cash-payment-journal.png
diff --git a/content/applications/finance/accounting/bank/reconciliation/cash_transactions/cash-payment-reconciliation.png b/content/applications/finance/accounting/bank/reconciliation_cash/cash-payment-reconciliation.png
similarity index 100%
rename from content/applications/finance/accounting/bank/reconciliation/cash_transactions/cash-payment-reconciliation.png
rename to content/applications/finance/accounting/bank/reconciliation_cash/cash-payment-reconciliation.png
diff --git a/content/applications/finance/accounting/bank/reconciliation/cash_transactions/cash-payments-config.png b/content/applications/finance/accounting/bank/reconciliation_cash/cash-payments-config.png
similarity index 100%
rename from content/applications/finance/accounting/bank/reconciliation/cash_transactions/cash-payments-config.png
rename to content/applications/finance/accounting/bank/reconciliation_cash/cash-payments-config.png
diff --git a/content/applications/finance/accounting/bank/reconciliation/cash_transactions/new-transaction.png b/content/applications/finance/accounting/bank/reconciliation_cash/new-transaction.png
similarity index 100%
rename from content/applications/finance/accounting/bank/reconciliation/cash_transactions/new-transaction.png
rename to content/applications/finance/accounting/bank/reconciliation_cash/new-transaction.png
diff --git a/content/applications/finance/accounting/bank/reconciliation/reconciliation_models.rst b/content/applications/finance/accounting/bank/reconciliation_models.rst
similarity index 95%
rename from content/applications/finance/accounting/bank/reconciliation/reconciliation_models.rst
rename to content/applications/finance/accounting/bank/reconciliation_models.rst
index e331cee6c..e934cd0a3 100644
--- a/content/applications/finance/accounting/bank/reconciliation/reconciliation_models.rst
+++ b/content/applications/finance/accounting/bank/reconciliation_models.rst
@@ -9,7 +9,7 @@ with **recurrent entries** such as bank fees.
 
 .. note::
    Reconciliation models are also useful when handling *Cash Discounts*. Please refer to
-   :doc:`the cash discounts <../../receivables/customer_invoices/cash_discounts>` for more
+   :doc:`the cash discounts <../customer_invoices/cash_discounts>` for more
    information.
 
 .. _reconciliation_models_types:
@@ -121,6 +121,6 @@ second time.
 
 .. seealso::
 
-   - :doc:`use_cases`
-   - :doc:`../bank_synchronization`
-   - :doc:`../../receivables/customer_invoices/cash_discounts`
+   - :doc:`reconciliation`
+   - :doc:`bank_synchronization`
+   - :doc:`../customer_invoices/cash_discounts`
diff --git a/content/applications/finance/accounting/bank/reconciliation/reconciliation_models/reconciliation_models_button.png b/content/applications/finance/accounting/bank/reconciliation_models/reconciliation_models_button.png
similarity index 100%
rename from content/applications/finance/accounting/bank/reconciliation/reconciliation_models/reconciliation_models_button.png
rename to content/applications/finance/accounting/bank/reconciliation_models/reconciliation_models_button.png
diff --git a/content/applications/finance/accounting/bank/reconciliation/reconciliation_models/reconciliation_models_conditions.png b/content/applications/finance/accounting/bank/reconciliation_models/reconciliation_models_conditions.png
similarity index 100%
rename from content/applications/finance/accounting/bank/reconciliation/reconciliation_models/reconciliation_models_conditions.png
rename to content/applications/finance/accounting/bank/reconciliation_models/reconciliation_models_conditions.png
diff --git a/content/applications/finance/accounting/bank/reconciliation/reconciliation_models/reconciliation_models_counterparts.png b/content/applications/finance/accounting/bank/reconciliation_models/reconciliation_models_counterparts.png
similarity index 100%
rename from content/applications/finance/accounting/bank/reconciliation/reconciliation_models/reconciliation_models_counterparts.png
rename to content/applications/finance/accounting/bank/reconciliation_models/reconciliation_models_counterparts.png
diff --git a/content/applications/finance/accounting/bank/reconciliation/reconciliation_models/reconciliation_models_match.png b/content/applications/finance/accounting/bank/reconciliation_models/reconciliation_models_match.png
similarity index 100%
rename from content/applications/finance/accounting/bank/reconciliation/reconciliation_models/reconciliation_models_match.png
rename to content/applications/finance/accounting/bank/reconciliation_models/reconciliation_models_match.png
diff --git a/content/applications/finance/accounting/bank/reconciliation/reconciliation_models/reconciliation_models_overview.png b/content/applications/finance/accounting/bank/reconciliation_models/reconciliation_models_overview.png
similarity index 100%
rename from content/applications/finance/accounting/bank/reconciliation/reconciliation_models/reconciliation_models_overview.png
rename to content/applications/finance/accounting/bank/reconciliation_models/reconciliation_models_overview.png
diff --git a/content/applications/finance/accounting/bank/reconciliation/reconciliation_models/reconciliation_models_suggestion.png b/content/applications/finance/accounting/bank/reconciliation_models/reconciliation_models_suggestion.png
similarity index 100%
rename from content/applications/finance/accounting/bank/reconciliation/reconciliation_models/reconciliation_models_suggestion.png
rename to content/applications/finance/accounting/bank/reconciliation_models/reconciliation_models_suggestion.png
diff --git a/content/applications/finance/accounting/bank/setup.rst b/content/applications/finance/accounting/bank/setup.rst
deleted file mode 100644
index eabd9fac0..000000000
--- a/content/applications/finance/accounting/bank/setup.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-:nosearch:
-
-=====
-Setup
-=====
-
-.. toctree::
-   :titlesonly:
-
-   setup/bank_accounts
-   setup/foreign_currency
-   setup/manage_cash_register
-   setup/outstanding_accounts
diff --git a/content/applications/finance/accounting/bank/setup/bank_accounts.rst b/content/applications/finance/accounting/bank/setup/bank_accounts.rst
deleted file mode 100644
index cde084d39..000000000
--- a/content/applications/finance/accounting/bank/setup/bank_accounts.rst
+++ /dev/null
@@ -1,136 +0,0 @@
-=============
-Bank accounts
-=============
-
-You can manage as many bank or cash accounts as needed on your database. Configuring them well
-allows you to have all your banking data up-to-date and ready for :doc:`reconciliation
-<../reconciliation/use_cases>` with your journal entries.
-
-In Odoo Accounting, each bank account has a dedicated journal set to post all entries in a dedicated
-account. Both the journal and the account are automatically created and configured whenever you add
-a bank account.
-
-.. note::
-   Cash journals and accounts must be configured manually.
-
-Bank journals are displayed by default on the :guilabel:`Accounting Dashboard` in the form of cards
-which include action buttons.
-
-.. image:: bank_accounts/card.png
-   :align: center
-   :alt: Bank journals are displayed on the Accounting Dashboard and contain action buttons
-
-.. _bank_accounts/manage:
-
-Manage your bank and cash accounts
-==================================
-
-Connect your bank for automatic synchronization
------------------------------------------------
-
-To connect your bank account to your database, go to :menuselection:`Accounting --> Configuration
---> Banks: Add a Bank Account`, select your bank in the list, click on :guilabel:`Connect`, and
-follow the instructions.
-
-.. seealso::
-   :doc:`../bank_synchronization`
-
-Create a bank account
----------------------
-
-If your banking institution is not available in Odoo, or if you don't want to connect your bank
-account to your database, you can configure your bank account manually.
-
-To manually add a bank account, go to :menuselection:`Accounting --> Configuration --> Banks:
-Add a Bank Account`, click on :guilabel:`Create it` (at the bottom right), and fill out the form.
-
-.. note::
-   - Odoo automatically detects the bank account type (e.g., IBAN) and enables some features
-     accordingly.
-   - A default bank journal is available and can be used to configure your bank account by going to
-     :menuselection:`Accounting --> Configuration --> Accounting: Journals --> Bank`. Open it and
-     edit the different fields to match your bank account information.
-
-Create a cash journal
----------------------
-
-To create a new cash journal, go to :menuselection:`Accounting --> Configuration --> Accounting:
-Journals`, click on :guilabel:`Create` and select :guilabel:`Cash` in the :guilabel:`Type` field.
-
-For more information on the accounting information fields, read the
-:ref:`bank_accounts/configuration` section of this page.
-
-.. note::
-   A default cash journal is available and can be used straight away. You can review it by going to
-   :menuselection:`Accounting --> Configuration --> Accounting: Journals --> Cash`.
-
-Edit an existing bank or cash journal
--------------------------------------
-
-To edit an existing bank journal, go to :menuselection:`Accounting --> Configuration --> Accounting:
-Journals` and select the journal you want to modify.
-
-.. _bank_accounts/configuration:
-
-Configuration
-=============
-
-You can edit the accounting information and bank account number according to your needs.
-
-.. image:: bank_accounts/bank-journal-config.png
-   :align: center
-   :alt: Manually configure your bank information
-
-.. seealso::
-   - :doc:`../../others/multi_currency`
-   - :doc:`../bank_statements`
-   - :doc:`../setup/outstanding_accounts`
-
-Suspense account
-----------------
-
-Bank statement transactions are posted on the :guilabel:`Suspense Account` until the final
-reconciliation allows finding the right account.
-
-Profit and loss accounts
-------------------------
-
-The :guilabel:`Profit Account` is used to register a profit when the ending balance of a cash
-register differs from what the system computes, while the :guilabel:`Loss Account` is used to
-register a loss when the ending balance of a cash register differs from what the system computes.
-
-Currency
---------
-
-You can edit the currency used to enter the statements.
-
-.. seealso::
-   :doc:`../../others/multi_currency`
-
-Account number
---------------
-
-If you need to **edit your bank account details**, click on the external link arrow next to your
-:guilabel:`Account Number`. On the new page, click on the external link arrow next to your
-:guilabel:`Bank` and update your bank information accordingly. These details are used when
-registering payments.
-
-.. image:: bank_accounts/bank-account-number.png
-   :align: center
-   :alt: Edit your bank information
-
-Bank feeds
-----------
-
-:guilabel:`Bank Feeds` defines how the bank statements are registered. Three options are available:
-
-- :guilabel:`Undefined yet`, which should be selected when you don’t know yet if you will
-  synchronize your bank account with your database or not.
-- :guilabel:`Import (CAMT, CODA, CSV, OFX, QIF)`, which should be selected if you want to import
-  your bank statement using a different format.
-- :guilabel:`Automated Bank Synchronization`, which should be selected if your bank is synchronized
-  with your database.
-
-.. seealso::
-   - :doc:`../bank_synchronization`
-   - :doc:`../bank_statements`
diff --git a/content/applications/finance/accounting/bank/setup/outstanding_accounts.rst b/content/applications/finance/accounting/bank/setup/outstanding_accounts.rst
deleted file mode 100644
index 9d4903909..000000000
--- a/content/applications/finance/accounting/bank/setup/outstanding_accounts.rst
+++ /dev/null
@@ -1,49 +0,0 @@
-====================
-Outstanding accounts
-====================
-
-By default, payments are registered through transitory accounts named **outstanding accounts**,
-before being recorded in your bank account.
-
-- An **outstanding payments account** is where outgoing payments are posted until they are linked
-  with a withdrawal from your bank statement.
-- An **outstanding receipts account** is where incoming payments are posted until they are linked
-  with a deposit from your bank statement.
-
-These accounts should be of :ref:`type <chart-of-account/type>` :guilabel:`Current Assets`.
-
-.. note::
-   The movement from an outstanding account to a bank account is done automatically when you
-   reconcile the bank account with a bank statement.
-
-Configuration
-=============
-
-Default accounts configuration
-------------------------------
-
-The outstanding accounts are defined by default. If necessary, you can update them by going to
-:menuselection:`Accounting --> Configuration --> Settings --> Default Accounts` and update your
-:guilabel:`Outstanding Receipts Account` and :guilabel:`Outstanding Payments Account`.
-
-Bank and cash journals configuration
-------------------------------------
-
-You can also set specific outstanding accounts for any journal with the :ref:`type
-<chart-of-account/type>` :guilabel:`Bank` or :guilabel:`Cash`.
-
-From your :guilabel:`Accounting Dashboard`, click on the menu selection ⋮ of the journal you want to
-configure, and click on :guilabel:`Configuration`, then open the :guilabel:`Incoming/Outgoing
-Payments` tab. To display the outstanding accounts column, click on the toggle button and check the
-:guilabel:`Outstanding Receipts/Payments accounts`, then update the account.
-
-.. image:: outstanding_accounts/toggle-button.png
-   :align: center
-   :alt: Select the toggle button and click on outstanding Accounts
-
-.. note::
-   - If you do not specify an outstanding payments account or an outstanding receipts account for a
-     specific journal, Odoo uses the default outstanding accounts.
-   - If your main bank account is added as an outstanding receipts account or outstanding payments
-     account, when a payment is registered, the invoice or bill's status is directly set to
-     :guilabel:`Paid`.
diff --git a/content/applications/finance/accounting/bank/setup/outstanding_accounts/toggle-button.png b/content/applications/finance/accounting/bank/toggle-button.png
similarity index 100%
rename from content/applications/finance/accounting/bank/setup/outstanding_accounts/toggle-button.png
rename to content/applications/finance/accounting/bank/toggle-button.png
diff --git a/content/applications/finance/accounting/getting_started/process_overview/customer_invoice.rst b/content/applications/finance/accounting/customer_invoices.rst
similarity index 84%
rename from content/applications/finance/accounting/getting_started/process_overview/customer_invoice.rst
rename to content/applications/finance/accounting/customer_invoices.rst
index 2fcaf854e..17e63a68b 100644
--- a/content/applications/finance/accounting/getting_started/process_overview/customer_invoice.rst
+++ b/content/applications/finance/accounting/customer_invoices.rst
@@ -1,4 +1,9 @@
-============================================
+:show-content:
+
+=================
+Customer invoices
+=================
+
 From Customer Invoice to Payments Collection
 ============================================
 
@@ -9,7 +14,7 @@ spanning multiple invoices and taking discounts for early payments, you
 can do so efficiently and accurately.
 
 From Draft Invoice to Profit and Loss
-=====================================
+-------------------------------------
 
 If we pick up at the end of a typical 'order to cash' scenario, after
 the goods have been shipped, you will: issue an invoice; receive
@@ -27,7 +32,7 @@ point, Odoo supports the creation of what is called a Draft Invoice by
 Warehouse staff.
 
 Invoice creation
-================
+----------------
 
 Draft invoices can be manually generated from other documents such as
 Sales Orders, Purchase Orders,etc. Although you can create a draft
@@ -39,7 +44,7 @@ and delivered. It must also include other information needed to pay the
 invoice in a timely and precise manner.
 
 Draft invoices
-==============
+--------------
 
 The system generates invoice which are initially set to the Draft state.
 While these invoices
@@ -55,11 +60,9 @@ Let's create a customer invoice with following information:
 - Unit Price: 100
 - Taxes: Tax 15%
 
-.. image:: customer_invoice/invoice01.png
-   :align: center
+.. image:: customer_invoices/invoice01.png
 
-.. image:: customer_invoice/invoice02.png
-   :align: center
+.. image:: customer_invoices/invoice02.png
 
 The document is composed of three parts:
 
@@ -68,7 +71,7 @@ The document is composed of three parts:
 -  the bottom of the page, with detail about the taxes, and the totals.
 
 Open or Pro-forma invoices
-==========================
+--------------------------
 
 An invoice will usually include the quantity and the price of goods
 and/or services, the date, any parties involved, the unique invoice
@@ -80,25 +83,22 @@ then moves from the Draft state to the Open state.
 When you have validated an invoice, Odoo gives it a unique number from a
 defined, and modifiable, sequence.
 
-.. image:: customer_invoice/invoice03.png
-   :align: center
+.. image:: customer_invoices/invoice03.png
 
 Accounting entries corresponding to this invoice are automatically
 generated when you validate the invoice. You can see the details by
 clicking on the entry in the Journal Entry field in the "Other Info"
 tab.
 
-.. image:: customer_invoice/invoice04.png
-   :align: center
+.. image:: customer_invoices/invoice04.png
 
 Send the invoice to customer
-============================
+----------------------------
 
 After validating the customer invoice, you can directly send it to the
 customer via the 'Send by email' functionality.
 
-.. image:: customer_invoice/invoice05.png
-   :align: center
+.. image:: customer_invoices/invoice05.png
 
 A typical journal entry generated from a validated invoice will look
 like as follows:
@@ -114,7 +114,7 @@ like as follows:
 +-----------------------+---------------+----------------+-------------+--------------+
 
 Payment
-=======
+-------
 
 In Odoo, an invoice is considered to be paid when the associated
 accounting entry has been reconciled with the payment entries. If there
@@ -133,7 +133,7 @@ follows:
 +-----------------------+---------------+----------------+-------------+--------------+
 
 Receive a partial payment through the bank statement
-====================================================
+----------------------------------------------------
 
 You can manually enter your bank statements in Odoo, or you can import
 them in from a csv file or from several other predefined formats
@@ -142,16 +142,14 @@ according to your accounting localisation.
 Create a bank statement from the accounting dashboard with the related
 journal and enter an amount of $100 .
 
-.. image:: customer_invoice/invoice06.png
-   :align: center
+.. image:: customer_invoices/invoice06.png
 
 Reconcile
-=========
+---------
 
 Now let's reconcile!
 
-.. image:: customer_invoice/invoice07.png
-   :align: center
+.. image:: customer_invoices/invoice07.png
 
 You can now go through every transaction and reconcile them or you can mass reconcile with instructions at the bottom.
 
@@ -159,20 +157,17 @@ After reconciling the items in the sheet, the related invoice will now
 display "You have outstanding payments for this customer. You can
 reconcile them to pay this invoice. "
 
-.. image:: customer_invoice/invoice08.png
-   :align: center
+.. image:: customer_invoices/invoice08.png
 
-.. image:: customer_invoice/invoice09.png
-   :align: center
+.. image:: customer_invoices/invoice09.png
 
 Apply the payment. Below, you can see that the payment has been added to
 the invoice.
 
-.. image:: customer_invoice/invoice10.png
-   :align: center
+.. image:: customer_invoices/invoice10.png
 
 Payment Followup
-================
+----------------
 
 There's a growing trend of customers paying bills later and later.
 Therefore, collectors must make every effort to collect money and
@@ -189,14 +184,12 @@ will be executed.
 By going to the customer record and diving into the "Overdue Payments"
 you will see the follow-up message and all overdue invoices.
 
-.. image:: customer_invoice/invoice11.png
-   :align: center
+.. image:: customer_invoices/invoice11.png
 
-.. image:: customer_invoice/invoice12.png
-   :align: center
+.. image:: customer_invoices/invoice12.png
 
 Customer aging report:
-----------------------
+~~~~~~~~~~~~~~~~~~~~~~
 
 The customer aging report will be an additional key tool for the
 collector to understand the customer credit issues, and to prioritize
@@ -205,32 +198,41 @@ their work.
 Use the aging report to determine which customers are overdue and begin
 your collection efforts.
 
-.. image:: customer_invoice/invoice13.png
-   :align: center
+.. image:: customer_invoices/invoice13.png
 
 Profit and loss
-===============
+---------------
 
 The Profit and Loss statement displays your revenue and expense details.
 Ultimately, this gives you a clear image of your Net Profit and Loss. It
 is sometimes referred to as the "Income Statement" or "Statement of
 Revenues and Expenses."
 
-.. image:: customer_invoice/invoice14.png
-   :align: center
+.. image:: customer_invoices/invoice14.png
 
 Balance sheet
-=============
+-------------
 
 The balance sheet summarizes your company's liabilities,
 assets and equity at a specific moment in time.
 
-.. image:: customer_invoice/invoice15.png
-   :align: center
+.. image:: customer_invoices/invoice15.png
 
-.. image:: customer_invoice/invoice16.png
-   :align: center
+.. image:: customer_invoices/invoice16.png
 
 For example, if you manage your inventory using the perpetual accounting
 method, you should expect a decrease in account "Current Assets" once
 the material has been shipped to the customer.
+
+.. toctree::
+   :titlesonly:
+
+   customer_invoices/overview
+   customer_invoices/payment_terms
+   customer_invoices/cash_discounts
+   customer_invoices/credit_notes
+   customer_invoices/cash_rounding
+   customer_invoices/deferred_revenues
+   customer_invoices/electronic_invoicing
+   customer_invoices/snailmail
+   customer_invoices/epc_qr_code
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/cash_discounts.rst b/content/applications/finance/accounting/customer_invoices/cash_discounts.rst
similarity index 92%
rename from content/applications/finance/accounting/receivables/customer_invoices/cash_discounts.rst
rename to content/applications/finance/accounting/customer_invoices/cash_discounts.rst
index be1d3c778..e8c1a0ecc 100644
--- a/content/applications/finance/accounting/receivables/customer_invoices/cash_discounts.rst
+++ b/content/applications/finance/accounting/customer_invoices/cash_discounts.rst
@@ -1,6 +1,6 @@
-====================
-Offer cash discounts
-====================
+==============
+Cash discounts
+==============
 
 Cash discounts are incentives you can offer to customers to motivate
 them to pay within a specific time frame. For instance, you offer a 2%
@@ -64,5 +64,5 @@ match the payment with the two related journal entries.
 
 
 .. seealso::
-  * :doc:`../../receivables/customer_invoices/payment_terms`
-  * :doc:`../../bank/reconciliation/reconciliation_models`
+  * :doc:`payment_terms`
+  * :doc:`../bank/reconciliation_models`
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/cash_discounts/cash_discounts01.png b/content/applications/finance/accounting/customer_invoices/cash_discounts/cash_discounts01.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/cash_discounts/cash_discounts01.png
rename to content/applications/finance/accounting/customer_invoices/cash_discounts/cash_discounts01.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/cash_discounts/cash_discounts02.png b/content/applications/finance/accounting/customer_invoices/cash_discounts/cash_discounts02.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/cash_discounts/cash_discounts02.png
rename to content/applications/finance/accounting/customer_invoices/cash_discounts/cash_discounts02.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/cash_discounts/cash_discounts03.png b/content/applications/finance/accounting/customer_invoices/cash_discounts/cash_discounts03.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/cash_discounts/cash_discounts03.png
rename to content/applications/finance/accounting/customer_invoices/cash_discounts/cash_discounts03.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/cash_discounts/cash_discounts04.png b/content/applications/finance/accounting/customer_invoices/cash_discounts/cash_discounts04.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/cash_discounts/cash_discounts04.png
rename to content/applications/finance/accounting/customer_invoices/cash_discounts/cash_discounts04.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/cash_rounding.rst b/content/applications/finance/accounting/customer_invoices/cash_rounding.rst
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/cash_rounding.rst
rename to content/applications/finance/accounting/customer_invoices/cash_rounding.rst
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/cash_rounding/cash_rounding01.png b/content/applications/finance/accounting/customer_invoices/cash_rounding/cash_rounding01.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/cash_rounding/cash_rounding01.png
rename to content/applications/finance/accounting/customer_invoices/cash_rounding/cash_rounding01.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/credit_notes.rst b/content/applications/finance/accounting/customer_invoices/credit_notes.rst
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/credit_notes.rst
rename to content/applications/finance/accounting/customer_invoices/credit_notes.rst
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/credit_notes/credit_notes01.png b/content/applications/finance/accounting/customer_invoices/credit_notes/credit_notes01.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/credit_notes/credit_notes01.png
rename to content/applications/finance/accounting/customer_invoices/credit_notes/credit_notes01.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/credit_notes/credit_notes02.png b/content/applications/finance/accounting/customer_invoices/credit_notes/credit_notes02.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/credit_notes/credit_notes02.png
rename to content/applications/finance/accounting/customer_invoices/credit_notes/credit_notes02.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/credit_notes/credit_notes03.png b/content/applications/finance/accounting/customer_invoices/credit_notes/credit_notes03.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/credit_notes/credit_notes03.png
rename to content/applications/finance/accounting/customer_invoices/credit_notes/credit_notes03.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/credit_notes/credit_notes04.png b/content/applications/finance/accounting/customer_invoices/credit_notes/credit_notes04.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/credit_notes/credit_notes04.png
rename to content/applications/finance/accounting/customer_invoices/credit_notes/credit_notes04.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst b/content/applications/finance/accounting/customer_invoices/deferred_revenues.rst
similarity index 99%
rename from content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst
rename to content/applications/finance/accounting/customer_invoices/deferred_revenues.rst
index 0af63f500..d491fdb68 100644
--- a/content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst
+++ b/content/applications/finance/accounting/customer_invoices/deferred_revenues.rst
@@ -191,5 +191,5 @@ You have three choices for the **Automate Deferred Revenue** field:
    automate its sale. (see: `Choose a different Income Account for specific products`_).
 
 .. seealso::
-   * :doc:`../../getting_started/initial_configuration/chart_of_accounts`
+   * :doc:`../get_started/chart_of_accounts`
    * `Odoo Academy: Deferred Revenues (Recognition) <https://www.odoo.com/r/EWO>`_
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues/deferred_revenues01.png b/content/applications/finance/accounting/customer_invoices/deferred_revenues/deferred_revenues01.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues/deferred_revenues01.png
rename to content/applications/finance/accounting/customer_invoices/deferred_revenues/deferred_revenues01.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues/deferred_revenues02.png b/content/applications/finance/accounting/customer_invoices/deferred_revenues/deferred_revenues02.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues/deferred_revenues02.png
rename to content/applications/finance/accounting/customer_invoices/deferred_revenues/deferred_revenues02.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues/deferred_revenues03.png b/content/applications/finance/accounting/customer_invoices/deferred_revenues/deferred_revenues03.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues/deferred_revenues03.png
rename to content/applications/finance/accounting/customer_invoices/deferred_revenues/deferred_revenues03.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues/deferred_revenues04.png b/content/applications/finance/accounting/customer_invoices/deferred_revenues/deferred_revenues04.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues/deferred_revenues04.png
rename to content/applications/finance/accounting/customer_invoices/deferred_revenues/deferred_revenues04.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues/deferred_revenues05.png b/content/applications/finance/accounting/customer_invoices/deferred_revenues/deferred_revenues05.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues/deferred_revenues05.png
rename to content/applications/finance/accounting/customer_invoices/deferred_revenues/deferred_revenues05.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues/deferred_revenues06.png b/content/applications/finance/accounting/customer_invoices/deferred_revenues/deferred_revenues06.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues/deferred_revenues06.png
rename to content/applications/finance/accounting/customer_invoices/deferred_revenues/deferred_revenues06.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues/deferred_revenues07.png b/content/applications/finance/accounting/customer_invoices/deferred_revenues/deferred_revenues07.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues/deferred_revenues07.png
rename to content/applications/finance/accounting/customer_invoices/deferred_revenues/deferred_revenues07.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues/deferred_revenues08.png b/content/applications/finance/accounting/customer_invoices/deferred_revenues/deferred_revenues08.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues/deferred_revenues08.png
rename to content/applications/finance/accounting/customer_invoices/deferred_revenues/deferred_revenues08.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues/deferred_revenues09.png b/content/applications/finance/accounting/customer_invoices/deferred_revenues/deferred_revenues09.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues/deferred_revenues09.png
rename to content/applications/finance/accounting/customer_invoices/deferred_revenues/deferred_revenues09.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/electronic_invoicing.rst b/content/applications/finance/accounting/customer_invoices/electronic_invoicing.rst
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/electronic_invoicing.rst
rename to content/applications/finance/accounting/customer_invoices/electronic_invoicing.rst
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/electronic_invoicing/formats.png b/content/applications/finance/accounting/customer_invoices/electronic_invoicing/formats.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/electronic_invoicing/formats.png
rename to content/applications/finance/accounting/customer_invoices/electronic_invoicing/formats.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/epc_qr_code.rst b/content/applications/finance/accounting/customer_invoices/epc_qr_code.rst
similarity index 94%
rename from content/applications/finance/accounting/receivables/customer_invoices/epc_qr_code.rst
rename to content/applications/finance/accounting/customer_invoices/epc_qr_code.rst
index 43009484a..34220030a 100644
--- a/content/applications/finance/accounting/receivables/customer_invoices/epc_qr_code.rst
+++ b/content/applications/finance/accounting/customer_invoices/epc_qr_code.rst
@@ -1,6 +1,6 @@
-============================
-Add EPC QR Codes to invoices
-============================
+============
+EPC QR Codes
+============
 
 European Payments Council Quick Response Code,
 or **EPC QR Code**, are two-dimensional barcodes
@@ -65,5 +65,5 @@ the EPC QR Code.
    under the *Other Info* tab of the invoice.
 
 .. seealso::
-   * :doc:`../../bank/setup/bank_accounts`
+   * :doc:`../bank`
    * `Odoo Academy: QR Code on Invoices for European Customers <https://www.odoo.com/r/VuU>`_
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/epc_qr_code/epc_qr_code01.png b/content/applications/finance/accounting/customer_invoices/epc_qr_code/epc_qr_code01.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/epc_qr_code/epc_qr_code01.png
rename to content/applications/finance/accounting/customer_invoices/epc_qr_code/epc_qr_code01.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/epc_qr_code/epc_qr_code02.png b/content/applications/finance/accounting/customer_invoices/epc_qr_code/epc_qr_code02.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/epc_qr_code/epc_qr_code02.png
rename to content/applications/finance/accounting/customer_invoices/epc_qr_code/epc_qr_code02.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/epc_qr_code/epc_qr_code03.png b/content/applications/finance/accounting/customer_invoices/epc_qr_code/epc_qr_code03.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/epc_qr_code/epc_qr_code03.png
rename to content/applications/finance/accounting/customer_invoices/epc_qr_code/epc_qr_code03.png
diff --git a/content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice01.png b/content/applications/finance/accounting/customer_invoices/invoice01.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice01.png
rename to content/applications/finance/accounting/customer_invoices/invoice01.png
diff --git a/content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice02.png b/content/applications/finance/accounting/customer_invoices/invoice02.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice02.png
rename to content/applications/finance/accounting/customer_invoices/invoice02.png
diff --git a/content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice03.png b/content/applications/finance/accounting/customer_invoices/invoice03.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice03.png
rename to content/applications/finance/accounting/customer_invoices/invoice03.png
diff --git a/content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice04.png b/content/applications/finance/accounting/customer_invoices/invoice04.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice04.png
rename to content/applications/finance/accounting/customer_invoices/invoice04.png
diff --git a/content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice05.png b/content/applications/finance/accounting/customer_invoices/invoice05.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice05.png
rename to content/applications/finance/accounting/customer_invoices/invoice05.png
diff --git a/content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice06.png b/content/applications/finance/accounting/customer_invoices/invoice06.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice06.png
rename to content/applications/finance/accounting/customer_invoices/invoice06.png
diff --git a/content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice07.png b/content/applications/finance/accounting/customer_invoices/invoice07.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice07.png
rename to content/applications/finance/accounting/customer_invoices/invoice07.png
diff --git a/content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice08.png b/content/applications/finance/accounting/customer_invoices/invoice08.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice08.png
rename to content/applications/finance/accounting/customer_invoices/invoice08.png
diff --git a/content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice09.png b/content/applications/finance/accounting/customer_invoices/invoice09.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice09.png
rename to content/applications/finance/accounting/customer_invoices/invoice09.png
diff --git a/content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice10.png b/content/applications/finance/accounting/customer_invoices/invoice10.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice10.png
rename to content/applications/finance/accounting/customer_invoices/invoice10.png
diff --git a/content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice11.png b/content/applications/finance/accounting/customer_invoices/invoice11.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice11.png
rename to content/applications/finance/accounting/customer_invoices/invoice11.png
diff --git a/content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice12.png b/content/applications/finance/accounting/customer_invoices/invoice12.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice12.png
rename to content/applications/finance/accounting/customer_invoices/invoice12.png
diff --git a/content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice13.png b/content/applications/finance/accounting/customer_invoices/invoice13.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice13.png
rename to content/applications/finance/accounting/customer_invoices/invoice13.png
diff --git a/content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice14.png b/content/applications/finance/accounting/customer_invoices/invoice14.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice14.png
rename to content/applications/finance/accounting/customer_invoices/invoice14.png
diff --git a/content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice15.png b/content/applications/finance/accounting/customer_invoices/invoice15.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice15.png
rename to content/applications/finance/accounting/customer_invoices/invoice15.png
diff --git a/content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice16.png b/content/applications/finance/accounting/customer_invoices/invoice16.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/process_overview/customer_invoice/invoice16.png
rename to content/applications/finance/accounting/customer_invoices/invoice16.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/overview.rst b/content/applications/finance/accounting/customer_invoices/overview.rst
similarity index 98%
rename from content/applications/finance/accounting/receivables/customer_invoices/overview.rst
rename to content/applications/finance/accounting/customer_invoices/overview.rst
index 9b1479aba..7d9cda63e 100644
--- a/content/applications/finance/accounting/receivables/customer_invoices/overview.rst
+++ b/content/applications/finance/accounting/customer_invoices/overview.rst
@@ -159,4 +159,4 @@ Vendor bills and customer invoices forms are automatically created and populated
 invoices.
 
 .. seealso::
-   - :doc:`/applications/finance/accounting/payables/supplier_bills/invoice_digitization`
+   - :doc:`/applications/finance/accounting/vendor_bills/invoice_digitization`
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst b/content/applications/finance/accounting/customer_invoices/payment_terms.rst
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst
rename to content/applications/finance/accounting/customer_invoices/payment_terms.rst
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/payment_terms/configuration.png b/content/applications/finance/accounting/customer_invoices/payment_terms/configuration.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/payment_terms/configuration.png
rename to content/applications/finance/accounting/customer_invoices/payment_terms/configuration.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/payment_terms/journal-entry.png b/content/applications/finance/accounting/customer_invoices/payment_terms/journal-entry.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/payment_terms/journal-entry.png
rename to content/applications/finance/accounting/customer_invoices/payment_terms/journal-entry.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst b/content/applications/finance/accounting/customer_invoices/snailmail.rst
similarity index 96%
rename from content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst
rename to content/applications/finance/accounting/customer_invoices/snailmail.rst
index 2463c992a..dfb0c32e5 100644
--- a/content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst
+++ b/content/applications/finance/accounting/customer_invoices/snailmail.rst
@@ -44,7 +44,7 @@ your customer’s address is set correctly, including the country, before sendin
 Pricing
 =======
 
-Snailmail is an :doc:`../../../../general/in_app_purchase` service that requires prepaid stamps
+Snailmail is an :doc:`/applications/general/in_app_purchase` service that requires prepaid stamps
 (=credits) to work. Sending one document consumes one stamp.
 
 To buy stamps, go to :menuselection:`Accounting --> Configuration --> Settings --> Customer
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/snailmail/setup-snailmail.png b/content/applications/finance/accounting/customer_invoices/snailmail/setup-snailmail.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/snailmail/setup-snailmail.png
rename to content/applications/finance/accounting/customer_invoices/snailmail/setup-snailmail.png
diff --git a/content/applications/finance/accounting/receivables/customer_invoices/snailmail/snailmail-template.pdf b/content/applications/finance/accounting/customer_invoices/snailmail/snailmail-template.pdf
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_invoices/snailmail/snailmail-template.pdf
rename to content/applications/finance/accounting/customer_invoices/snailmail/snailmail-template.pdf
diff --git a/content/applications/finance/accounting/getting_started/initial_configuration/setup.rst b/content/applications/finance/accounting/get_started.rst
similarity index 87%
rename from content/applications/finance/accounting/getting_started/initial_configuration/setup.rst
rename to content/applications/finance/accounting/get_started.rst
index 09968602b..077ce236b 100644
--- a/content/applications/finance/accounting/getting_started/initial_configuration/setup.rst
+++ b/content/applications/finance/accounting/get_started.rst
@@ -1,6 +1,8 @@
-===================================================
-Initial setup of Odoo Accounting and Odoo Invoicing
-===================================================
+:show-content:
+
+===========
+Get started
+===========
 
 When you first open your Odoo Accounting app, the *Accounting Overview* page welcomes you with a
 step-by-step onboarding banner, a wizard that helps you get started. This onboarding banner is
@@ -20,8 +22,7 @@ Accounting onboarding banner
 
 The step-by-step Accounting onboarding banner is composed of four steps:
 
-.. image:: setup/setup_accounting_onboarding.png
-   :align: center
+.. image:: get_started/setup_accounting_onboarding.png
    :alt: Step-by-step onboarding banner in Odoo Accounting
 
 #. :ref:`accounting-setup-company`
@@ -38,8 +39,7 @@ This menu allows you to add your company’s details such as the name, address,
 number, email address, and Tax ID, or VAT number. These details are then displayed on your documents,
 such as on invoices.
 
-.. image:: setup/setup_company.png
-   :align: center
+.. image:: get_started/setup_company.png
    :alt: Add your company's details in Odoo Accounting and Odoo Invoicing
 
 .. note::
@@ -55,7 +55,7 @@ Connect your bank account to your database and have your bank statements synced
 so, find your bank in the list, click on *Connect*, and follow the instructions on-screen.
 
 .. note::
-   :doc:`Click here <../../bank/bank_synchronization>` for more information about this feature.
+   :doc:`Click here <bank/bank_synchronization>` for more information about this feature.
 
 If your Bank Institution can’t be synchronized automatically, or if you prefer not to sync it with
 your database, you may also configure your bank account manually by clicking on *Create it*, and
@@ -74,7 +74,7 @@ filling out the form.
 .. note::
    - You can add as many bank accounts as needed with this tool by going to :menuselection:`Accounting
      --> Configuration`, and clicking on *Add a Bank Account*.
-   - :doc:`Click here <../../bank/setup/bank_accounts>` for more information about Bank
+   - :doc:`Click here <bank>` for more information about Bank
      Accounts.
 
 .. _accounting-setup-periods:
@@ -104,12 +104,11 @@ opening balances.
 Basic settings are displayed on this page to help you review your Chart of Accounts. To access all
 the settings of an account, click on the *double arrow button* at the end of the line.
 
-.. image:: setup/setup_chart_of_accounts.png
-   :align: center
+.. image:: get_started/setup_chart_of_accounts.png
    :alt: Setup of the Chart of Accounts and their opening balances in Odoo Accounting
 
 .. note::
-   :doc:`Click here <chart_of_accounts>` for more information on how to configure your Chart of
+   :doc:`Click here <get_started/chart_of_accounts>` for more information on how to configure your Chart of
    Accounts.
 
 Invoicing onboarding banner
@@ -124,8 +123,7 @@ If you have Odoo Accounting installed on your database, you can reach it by goin
 
 The Invoicing onboarding banner is composed of four main steps:
 
-.. image:: setup/setup_invoicing_onboarding.png
-   :align: center
+.. image:: get_started/setup_invoicing_onboarding.png
    :alt: Step-by-step onboarding banner in Odoo Invoicing
 
 #. :ref:`invoicing-setup-company`
@@ -154,8 +152,7 @@ automatically adds the company's phone number, email, website URL, and Tax ID (o
 footer, according to the values you previously configured in the :ref:`Company Data
 <accounting-setup-company>`.
 
-.. image:: setup/setup_document_layout.png
-   :align: center
+.. image:: get_started/setup_document_layout.png
    :alt: Document layout configuration in Odoo Invoicing
 
 .. tip::
@@ -186,8 +183,16 @@ Sample Invoice
 Send yourself a sample invoice by email to make sure everything is correctly configured.
 
 .. seealso::
-   * :doc:`../../bank/setup/bank_accounts`
-   * :doc:`chart_of_accounts`
-   * :doc:`../../bank/bank_synchronization`
-   * :doc:`../../../fiscal_localizations`
+   * :doc:`bank`
+   * :doc:`get_started/chart_of_accounts`
+   * :doc:`bank/bank_synchronization`
+   * :doc:`../fiscal_localizations`
    * `Odoo Tutorials: Accounting Basics <https://www.odoo.com/r/lsZ>`_
+
+.. toctree::
+   :titlesonly:
+
+   get_started/cheat_sheet
+   get_started/chart_of_accounts
+   get_started/multi_currency
+   get_started/avg_price_valuation
diff --git a/content/applications/finance/accounting/others/inventory/avg_price_valuation.rst b/content/applications/finance/accounting/get_started/avg_price_valuation.rst
similarity index 97%
rename from content/applications/finance/accounting/others/inventory/avg_price_valuation.rst
rename to content/applications/finance/accounting/get_started/avg_price_valuation.rst
index f98dcc03c..26359d9f0 100644
--- a/content/applications/finance/accounting/others/inventory/avg_price_valuation.rst
+++ b/content/applications/finance/accounting/get_started/avg_price_valuation.rst
@@ -1,9 +1,9 @@
-==========================================================
-Impact on the average price valuation when returning goods
-==========================================================
+=================================
+Inventory average price valuation
+=================================
 
-As stated in the `*inventory valuation
-page* <https://www.odoo.com/documentation/functional/valuation.html>`__,
+As stated in the :doc:`inventory valuation page
+</applications/inventory_and_mrp/inventory/management/reporting/inventory_valuation_config>`,
 one of the possible costing method you can use in perpetual stock
 valuation, is the average cost.
 
diff --git a/content/applications/finance/accounting/others/inventory/avg_price_valuation/avg01.png b/content/applications/finance/accounting/get_started/avg_price_valuation/avg01.png
similarity index 100%
rename from content/applications/finance/accounting/others/inventory/avg_price_valuation/avg01.png
rename to content/applications/finance/accounting/get_started/avg_price_valuation/avg01.png
diff --git a/content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst b/content/applications/finance/accounting/get_started/chart_of_accounts.rst
similarity index 96%
rename from content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst
rename to content/applications/finance/accounting/get_started/chart_of_accounts.rst
index 2595a8b96..e4d165b03 100644
--- a/content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst
+++ b/content/applications/finance/accounting/get_started/chart_of_accounts.rst
@@ -182,8 +182,8 @@ them unusable by using the **Deprecated** feature.
 To do so, check the :guilabel:`Deprecated` box in the account's settings, and save.
 
 .. seealso::
-   * :doc:`../cheat_sheet`
-   * :doc:`../../payables/supplier_bills/assets`
-   * :doc:`../../payables/supplier_bills/deferred_expenses`
-   * :doc:`../../receivables/customer_invoices/deferred_revenues`
-   * :doc:`../../../fiscal_localizations`
+   * :doc:`cheat_sheet`
+   * :doc:`../vendor_bills/assets`
+   * :doc:`../vendor_bills/deferred_expenses`
+   * :doc:`../customer_invoices/deferred_revenues`
+   * :doc:`../../fiscal_localizations`
diff --git a/content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts/account-groups.png b/content/applications/finance/accounting/get_started/chart_of_accounts/account-groups.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts/account-groups.png
rename to content/applications/finance/accounting/get_started/chart_of_accounts/account-groups.png
diff --git a/content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts/chart-of-accounts.png b/content/applications/finance/accounting/get_started/chart_of_accounts/chart-of-accounts.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts/chart-of-accounts.png
rename to content/applications/finance/accounting/get_started/chart_of_accounts/chart-of-accounts.png
diff --git a/content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts/trial-balance.png b/content/applications/finance/accounting/get_started/chart_of_accounts/trial-balance.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts/trial-balance.png
rename to content/applications/finance/accounting/get_started/chart_of_accounts/trial-balance.png
diff --git a/content/applications/finance/accounting/getting_started/cheat_sheet.rst b/content/applications/finance/accounting/get_started/cheat_sheet.rst
similarity index 99%
rename from content/applications/finance/accounting/getting_started/cheat_sheet.rst
rename to content/applications/finance/accounting/get_started/cheat_sheet.rst
index 6f9916e67..19a9e0a5f 100644
--- a/content/applications/finance/accounting/getting_started/cheat_sheet.rst
+++ b/content/applications/finance/accounting/get_started/cheat_sheet.rst
@@ -147,7 +147,7 @@ credits.
 Reconciliation
 ==============
 
-:doc:`Reconciliation <../../accounting/bank/reconciliation/use_cases>` is the process of linking
+:doc:`Reconciliation <../../accounting/bank/reconciliation>` is the process of linking
 journal items of a specific account and matching credits and debits.
 
 Its primary purpose is to link payments to their related invoices to mark them as paid. This is done
diff --git a/content/applications/finance/accounting/others/multi_currency.rst b/content/applications/finance/accounting/get_started/multi_currency.rst
similarity index 99%
rename from content/applications/finance/accounting/others/multi_currency.rst
rename to content/applications/finance/accounting/get_started/multi_currency.rst
index 20ce775fb..30c9b0192 100644
--- a/content/applications/finance/accounting/others/multi_currency.rst
+++ b/content/applications/finance/accounting/get_started/multi_currency.rst
@@ -7,7 +7,7 @@ the main currency configured for your company. You can also set up bank accounts
 and run reports on your foreign currency activities.
 
 .. seealso::
-   - :doc:`../bank/setup/foreign_currency`
+   - :doc:`../bank/foreign_currency`
 
 .. _multi-currency/config:
 
diff --git a/content/applications/finance/accounting/others/multi_currency/account-currency.png b/content/applications/finance/accounting/get_started/multi_currency/account-currency.png
similarity index 100%
rename from content/applications/finance/accounting/others/multi_currency/account-currency.png
rename to content/applications/finance/accounting/get_started/multi_currency/account-currency.png
diff --git a/content/applications/finance/accounting/others/multi_currency/currency-field.png b/content/applications/finance/accounting/get_started/multi_currency/currency-field.png
similarity index 100%
rename from content/applications/finance/accounting/others/multi_currency/currency-field.png
rename to content/applications/finance/accounting/get_started/multi_currency/currency-field.png
diff --git a/content/applications/finance/accounting/others/multi_currency/enable-foreign-currencies.png b/content/applications/finance/accounting/get_started/multi_currency/enable-foreign-currencies.png
similarity index 100%
rename from content/applications/finance/accounting/others/multi_currency/enable-foreign-currencies.png
rename to content/applications/finance/accounting/get_started/multi_currency/enable-foreign-currencies.png
diff --git a/content/applications/finance/accounting/others/multi_currency/exchange-difference-journal.png b/content/applications/finance/accounting/get_started/multi_currency/exchange-difference-journal.png
similarity index 100%
rename from content/applications/finance/accounting/others/multi_currency/exchange-difference-journal.png
rename to content/applications/finance/accounting/get_started/multi_currency/exchange-difference-journal.png
diff --git a/content/applications/finance/accounting/others/multi_currency/exchange-journal-currency.png b/content/applications/finance/accounting/get_started/multi_currency/exchange-journal-currency.png
similarity index 100%
rename from content/applications/finance/accounting/others/multi_currency/exchange-journal-currency.png
rename to content/applications/finance/accounting/get_started/multi_currency/exchange-journal-currency.png
diff --git a/content/applications/finance/accounting/others/multi_currency/foreign-fields.png b/content/applications/finance/accounting/get_started/multi_currency/foreign-fields.png
similarity index 100%
rename from content/applications/finance/accounting/others/multi_currency/foreign-fields.png
rename to content/applications/finance/accounting/get_started/multi_currency/foreign-fields.png
diff --git a/content/applications/finance/accounting/others/multi_currency/journal-currency.png b/content/applications/finance/accounting/get_started/multi_currency/journal-currency.png
similarity index 100%
rename from content/applications/finance/accounting/others/multi_currency/journal-currency.png
rename to content/applications/finance/accounting/get_started/multi_currency/journal-currency.png
diff --git a/content/applications/finance/accounting/others/multi_currency/manual-rate-update.png b/content/applications/finance/accounting/get_started/multi_currency/manual-rate-update.png
similarity index 100%
rename from content/applications/finance/accounting/others/multi_currency/manual-rate-update.png
rename to content/applications/finance/accounting/get_started/multi_currency/manual-rate-update.png
diff --git a/content/applications/finance/accounting/others/multi_currency/register-payment.png b/content/applications/finance/accounting/get_started/multi_currency/register-payment.png
similarity index 100%
rename from content/applications/finance/accounting/others/multi_currency/register-payment.png
rename to content/applications/finance/accounting/get_started/multi_currency/register-payment.png
diff --git a/content/applications/finance/accounting/getting_started/initial_configuration/setup/setup_accounting_onboarding.png b/content/applications/finance/accounting/get_started/setup_accounting_onboarding.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/initial_configuration/setup/setup_accounting_onboarding.png
rename to content/applications/finance/accounting/get_started/setup_accounting_onboarding.png
diff --git a/content/applications/finance/accounting/getting_started/initial_configuration/setup/setup_chart_of_accounts.png b/content/applications/finance/accounting/get_started/setup_chart_of_accounts.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/initial_configuration/setup/setup_chart_of_accounts.png
rename to content/applications/finance/accounting/get_started/setup_chart_of_accounts.png
diff --git a/content/applications/finance/accounting/getting_started/initial_configuration/setup/setup_company.png b/content/applications/finance/accounting/get_started/setup_company.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/initial_configuration/setup/setup_company.png
rename to content/applications/finance/accounting/get_started/setup_company.png
diff --git a/content/applications/finance/accounting/getting_started/initial_configuration/setup/setup_document_layout.png b/content/applications/finance/accounting/get_started/setup_document_layout.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/initial_configuration/setup/setup_document_layout.png
rename to content/applications/finance/accounting/get_started/setup_document_layout.png
diff --git a/content/applications/finance/accounting/getting_started/initial_configuration/setup/setup_invoicing_onboarding.png b/content/applications/finance/accounting/get_started/setup_invoicing_onboarding.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/initial_configuration/setup/setup_invoicing_onboarding.png
rename to content/applications/finance/accounting/get_started/setup_invoicing_onboarding.png
diff --git a/content/applications/finance/accounting/getting_started.rst b/content/applications/finance/accounting/getting_started.rst
deleted file mode 100644
index 79d3eb189..000000000
--- a/content/applications/finance/accounting/getting_started.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-:nosearch:
-
-===============
-Getting started
-===============
-
-.. toctree::
-   :titlesonly:
-
-   getting_started/main_concept
-   getting_started/cheat_sheet
-   getting_started/initial_configuration
-   getting_started/process_overview
diff --git a/content/applications/finance/accounting/getting_started/initial_configuration.rst b/content/applications/finance/accounting/getting_started/initial_configuration.rst
deleted file mode 100644
index 499fec32a..000000000
--- a/content/applications/finance/accounting/getting_started/initial_configuration.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-:nosearch:
-
-=====================
-Initial configuration
-=====================
-
-.. toctree::
-   :titlesonly:
-
-   initial_configuration/setup
-   initial_configuration/chart_of_accounts
diff --git a/content/applications/finance/accounting/getting_started/main_concept.rst b/content/applications/finance/accounting/getting_started/main_concept.rst
deleted file mode 100644
index a7fc38ecd..000000000
--- a/content/applications/finance/accounting/getting_started/main_concept.rst
+++ /dev/null
@@ -1,138 +0,0 @@
-========================
-Main accounting concepts
-========================
-
-Double-entry bookkeeping
-========================
-
-Odoo automatically creates all the behind-the-scenes journal entries
-for each of your accounting transactions: customer invoices, point of
-sale order, expenses, inventory moves, etc.
-
-Odoo uses the rules of double-entry bookkeeping system: all journal
-entries are automatically balanced (sum of debits = sum of credits).
-
-.. seealso::
-   - :doc:`Understand Odoo's accounting transactions per document
-     <cheat_sheet>`
-
-Accrual and Cash Basis Methods
-==============================
-
-Odoo supports both accrual and cash basis reporting. This allows you to
-report income / expense at the time transactions occur (i.e., accrual basis), or when
-payment is made or received (i.e., cash basis).
-
-Multi-companies
-===============
-
-Odoo allows one to manage several companies within the same database. Each
-company has its own chart of accounts and rules. You can get
-consolidation reports following your consolidation rules.
-
-Users can access several companies but always work in one company at a
-time.
-
-Multi-currencies
-================
-
-Every transaction is recorded in the default currency of the
-company. For transactions occurring in another currency, Odoo stores
-both the value in the currency of the company and the value in the
-currency of the transaction. Odoo can generate currencies gains and
-losses after the reconciliation of the journal items.
-
-Currency rates are updated once a day using a yahoo.com online
-web-service.
-
-International Standards
-=======================
-
-Odoo accounting supports more than 50 countries. The Odoo core
-accounting implements accounting standards that are common to all
-countries. Specific modules exist per country for the
-specificities of the country like the chart of accounts, taxes, or
-bank interfaces.
-
-In particular, Odoo's core accounting engine supports:
-
-* Anglo-Saxon Accounting (U.S., U.K.,, and other English-speaking
-  countries including Ireland, Canada, Australia, and New Zealand)
-  where costs of good sold are reported when products are
-  sold/delivered.
-* European accounting where expenses are accounted at the supplier
-  bill.
-
-Odoo has modules to comply with IFRS rules.
-
-Accounts Receivable and Payable
-===============================
-
-By default, Odoo uses a single account for all account
-receivable entries and one for all accounts payable entries. You can
-create separate accounts per customers/suppliers, but you don't need
-to.
-
-As transactions are associated to customers or suppliers, you get
-reports to perform analysis per customer/supplier such as the customer
-statement, revenues per customers, aged receivable/payables, ...
-
-Wide range of financial reports
-===============================
-
-In Odoo, you can generate financial reports in real time. Odoo's
-reports range from basic accounting reports to advanced management
-reports. Odoo's reports include:
-
-* Performance reports (such as Profit and Loss, Budget Variance)
-* Position reports (such as Balance Sheet, Aged Payables, Aged
-  Receivables)
-* Cash reports (such as Bank Summary)
-* Detail reports (such as Trial Balance and General Ledger)
-* Management reports (such as Budgets, Executive Summary)
-
-Odoo's report engine allows you to customize your own report based on
-your own formulae.
-
-Import bank feeds automatically
-===============================
-
-Bank reconciliation is a process that matches your bank statement
-lines, as supplied by the bank, to your accounting transactions in the
-general ledger. Odoo makes bank reconciliation easy by frequently
-importing bank statement lines from your bank directly into your Odoo
-account. This means you can have a daily view of your cashflow without
-having to log into your online banking or wait for your paper bank
-statements.
-
-Odoo speeds up bank reconciliation by matching most of your imported
-bank statement lines to your accounting transactions. Odoo also
-remembers how you've treated other bank statement lines and provides
-suggested general ledger transactions.
-
-Calculate the tax you owe your tax authority
-============================================
-
-Odoo totals all your accounting transactions for your tax period and
-uses these totals to calculate your tax obligation. You can then check
-your sales tax by running Odoo's Tax Report.
-
-Inventory Valuation
-===================
-
-Odoo support both periodic (manual) and perpetual (automated)
-inventory valuations. The available methods are standard price,
-average price, LIFO (for countries allowing it) and FIFO.
-
-.. seealso::
-   - :doc:`View impact of the valuation method on your transactions
-     </applications/inventory_and_mrp/inventory/management/reporting/inventory_valuation_config>`
-
-Easy retained earnings
-======================
-
-Retained earnings are the portion of income retained by your
-business. Odoo automatically calculates your current year earnings in
-real time so no year-end journal or rollover is required.  This is
-calculated by reporting the profit and loss balance to your balance
-sheet report automatically.
diff --git a/content/applications/finance/accounting/getting_started/process_overview.rst b/content/applications/finance/accounting/getting_started/process_overview.rst
deleted file mode 100644
index cab8539fb..000000000
--- a/content/applications/finance/accounting/getting_started/process_overview.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-:nosearch:
-
-================
-Process overview
-================
-
-.. toctree::
-   :titlesonly:
-
-   process_overview/customer_invoice
-   process_overview/supplier_bill
diff --git a/content/applications/finance/accounting/others.rst b/content/applications/finance/accounting/others.rst
deleted file mode 100644
index 39d093e61..000000000
--- a/content/applications/finance/accounting/others.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-:nosearch:
-
-======
-Others
-======
-
-.. toctree::
-   :titlesonly:
-
-   others/multi_currency
-   others/analytic
-   others/adviser
-   others/inventory
diff --git a/content/applications/finance/accounting/others/adviser.rst b/content/applications/finance/accounting/others/adviser.rst
deleted file mode 100644
index a1ef7134c..000000000
--- a/content/applications/finance/accounting/others/adviser.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-:nosearch:
-
-=======
-Adviser
-=======
-
-.. toctree::
-   :titlesonly:
-
-   adviser/budget
diff --git a/content/applications/finance/accounting/others/adviser/fiscalyear.rst~ b/content/applications/finance/accounting/others/adviser/fiscalyear.rst~
deleted file mode 100644
index 8e376bb62..000000000
--- a/content/applications/finance/accounting/others/adviser/fiscalyear.rst~
+++ /dev/null
@@ -1,3 +0,0 @@
-=====================================================
-How to do a year end in Odoo? (close a fiscal year)
-=====================================================
diff --git a/content/applications/finance/accounting/others/analytic.rst b/content/applications/finance/accounting/others/analytic.rst
deleted file mode 100644
index 21dbe2dcb..000000000
--- a/content/applications/finance/accounting/others/analytic.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-:nosearch:
-
-========
-Analytic
-========
-
-.. toctree::
-   :titlesonly:
-
-   analytic/usage
-   analytic/timesheets
-   analytic/purchases_expenses
diff --git a/content/applications/finance/accounting/others/inventory.rst b/content/applications/finance/accounting/others/inventory.rst
deleted file mode 100644
index 7b51dd9fd..000000000
--- a/content/applications/finance/accounting/others/inventory.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-:nosearch:
-
-=========
-Inventory
-=========
-
-.. toctree::
-   :titlesonly:
-
-   inventory/avg_price_valuation
-   /applications/inventory_and_mrp/inventory/management/reporting/inventory_valuation_config
diff --git a/content/applications/finance/accounting/payables.rst b/content/applications/finance/accounting/payables.rst
deleted file mode 100644
index a6738bc5f..000000000
--- a/content/applications/finance/accounting/payables.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-:nosearch:
-
-================
-Account payables
-================
-
-.. toctree::
-   :titlesonly:
-
-   payables/supplier_bills
-   payables/pay
-   payables/misc
diff --git a/content/applications/finance/accounting/payables/misc.rst b/content/applications/finance/accounting/payables/misc.rst
deleted file mode 100644
index 05541760a..000000000
--- a/content/applications/finance/accounting/payables/misc.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-:nosearch:
-
-=============
-Miscellaneous
-=============
-
-.. toctree::
-   :titlesonly:
-
-   misc/forecast
diff --git a/content/applications/finance/accounting/payables/pay.rst b/content/applications/finance/accounting/payables/pay.rst
deleted file mode 100644
index d8c929cc2..000000000
--- a/content/applications/finance/accounting/payables/pay.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-:nosearch:
-
-===============
-Vendor payments
-===============
-
-.. toctree::
-   :titlesonly:
-
-   pay/sepa
-   pay/check
-   pay/multiple
diff --git a/content/applications/finance/accounting/payables/pay/check/check04.png b/content/applications/finance/accounting/payables/pay/check/check04.png
deleted file mode 100644
index fba3f5f1f..000000000
Binary files a/content/applications/finance/accounting/payables/pay/check/check04.png and /dev/null differ
diff --git a/content/applications/finance/accounting/payables/supplier_bills.rst b/content/applications/finance/accounting/payables/supplier_bills.rst
deleted file mode 100644
index 3de47b043..000000000
--- a/content/applications/finance/accounting/payables/supplier_bills.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-:nosearch:
-
-============
-Vendor bills
-============
-
-.. toctree::
-   :titlesonly:
-
-   supplier_bills/deferred_expenses
-   supplier_bills/assets
-   supplier_bills/invoice_digitization
diff --git a/content/applications/finance/accounting/receivables/customer_payments/recording.rst b/content/applications/finance/accounting/payments.rst
similarity index 83%
rename from content/applications/finance/accounting/receivables/customer_payments/recording.rst
rename to content/applications/finance/accounting/payments.rst
index d038ff1a7..686849abe 100644
--- a/content/applications/finance/accounting/receivables/customer_payments/recording.rst
+++ b/content/applications/finance/accounting/payments.rst
@@ -1,6 +1,8 @@
-==================================
-Different ways to record a payment
-==================================
+:show-content:
+
+========
+Payments
+========
 
 In Odoo, payments can either be linked automatically to an invoice or bill or be stand-alone records
 for use at a later date.
@@ -13,8 +15,8 @@ your company, or your company has an outstanding debit with a vendor. You can us
 amounts to reduce unpaid invoices/bills.
 
 .. seealso::
-   - :doc:`Internal transfers <../../bank/interbank>`
-   - :doc:`../../bank/reconciliation/use_cases`
+   - :doc:`Internal transfers <payments/internal_transfers>`
+   - :doc:`bank/reconciliation`
    - `Odoo Tutorials: Bank Configuration
      <https://www.odoo.com/slides/slide/bank-configuration-1880>`_
 
@@ -30,8 +32,7 @@ with a bank statement line, the invoice or vendor bill changes to the :guilabel:
 The information icon near the payment line displays more information about the payment. You can
 access additional information, such as the related journal, by clicking on :guilabel:`View`.
 
-.. image:: recording/information-icon.png
-   :align: center
+.. image:: payments/information-icon.png
    :alt: See detailed information of a payment
 
 .. note::
@@ -39,8 +40,8 @@ access additional information, such as the related journal, by clicking on :guil
      payment.
    - When clicking on :guilabel:`Register payment`, you can select the amount to pay and make a
      partial or full payment.
-   - If your main bank account is set as :doc:`outstanding account
-     <../../bank/setup/outstanding_accounts>`, and the payment is made in Odoo (not related to a
+   - If your main bank account is set as :ref:`outstanding account
+     <bank/outstanding-accounts>`, and the payment is made in Odoo (not related to a
      bank statement), invoices and bills are directly registered in the status :guilabel:`Paid`.
    - If you unreconciled a payment, it still appears in your books but is no longer linked to the
      invoice.
@@ -50,7 +51,7 @@ access additional information, such as the related journal, by clicking on :guil
      automatically created to post the cash basis tax (reversal) amount.
 
 .. seealso::
-   - :doc:`../../bank/reconciliation/use_cases`
+   - :doc:`bank/reconciliation`
 
 Registering payments not tied to an invoice or bill
 ===================================================
@@ -67,29 +68,28 @@ A blue banner appears when you validate a new invoice or bill and there is an ou
 for this specific customer or vendor. It can easily be matched from the invoice or the bill by
 clicking on :guilabel:`ADD` under :guilabel:`Outstanding Credits` or :guilabel:`Outstanding Debits`.
 
-.. image:: recording/add-option.png
-   :align: center
+.. image:: payments/add-option.png
    :alt: Shows the ADD option to reconcile an invoice or a bill with a payment
 
 The invoice or bill is now marked as :guilabel:`In payment` until it is reconciled with the bank
 statement.
 
 .. seealso::
-   - :doc:`../../bank/reconciliation/use_cases`
+   - :doc:`bank/reconciliation`
 
 Batch payment
 -------------
 
 Batch payments allow you to group different payments to ease :doc:`reconciliation
-<../../bank/reconciliation/use_cases>`. They are also useful when you deposit checks to the bank or
+<bank/reconciliation>`. They are also useful when you deposit checks to the bank or
 for SEPA Payments. To do so, go to :menuselection:`Accounting --> Customers --> Batch Payments` or
 :menuselection:`Accounting --> Vendors --> Batch Payments`. In the list view of payments, you can
 select several payments and group them in a batch by clicking on :menuselection:`Action --> Create
 Batch Payment`.
 
 .. seealso::
-  - :doc:`../../receivables/customer_payments/batch`
-  - :doc:`../../receivables/customer_payments/batch_sdd`
+  - :doc:`payments/batch`
+  - :doc:`payments/batch_sdd`
 
 Payments matching
 -----------------
@@ -101,7 +101,7 @@ Customer Invoices / Vendor Bills`, and click on :guilabel:`⋮` and select :guil
 Matching`, or by going to :menuselection:`Accounting --> Reconciliation`.
 
 .. note::
-   During the :doc:`reconciliation <../../bank/reconciliation/use_cases>`, if the sum of the debits
+   During the :doc:`reconciliation <bank/reconciliation>`, if the sum of the debits
    and credits does not match, there is a remaining balance. This either needs to be reconciled at a
    later date or needs to be written off directly.
 
@@ -113,8 +113,7 @@ the batch reconciliation feature can be used. Go to :menuselection:`Accounting -
 Aged Receivable / Aged Payable`. You now see all transactions that have not been reconciled yet, and
 when you select a customer or vendor, the :guilabel:`Reconcile` option is displayed.
 
-.. image:: recording/reconcile-option.png
-   :align: center
+.. image:: payments/reconcile-option.png
    :alt: See the reconcile option
 
 Reconciling payments with bank statements
@@ -125,4 +124,18 @@ next step is to reconcile it with the related bank statement line to have the tr
 and the invoice or bill marked as :guilabel:`Paid`.
 
 .. seealso::
-   - :doc:`../../bank/reconciliation/use_cases`
+   - :doc:`bank/reconciliation`
+
+.. toctree::
+   :titlesonly:
+
+   payments/online
+   payments/checks
+   payments/batch
+   payments/batch_sdd
+   payments/follow_up
+   payments/internal_transfers
+   payments/pay_sepa
+   payments/pay_checks
+   payments/multiple
+   payments/forecast
diff --git a/content/applications/finance/accounting/receivables/customer_payments/recording/add-option.png b/content/applications/finance/accounting/payments/add-option.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_payments/recording/add-option.png
rename to content/applications/finance/accounting/payments/add-option.png
diff --git a/content/applications/finance/accounting/receivables/customer_payments/batch.rst b/content/applications/finance/accounting/payments/batch.rst
similarity index 97%
rename from content/applications/finance/accounting/receivables/customer_payments/batch.rst
rename to content/applications/finance/accounting/payments/batch.rst
index 0ad316542..9ff3e110c 100644
--- a/content/applications/finance/accounting/receivables/customer_payments/batch.rst
+++ b/content/applications/finance/accounting/payments/batch.rst
@@ -41,7 +41,7 @@ Deposit multiple payments in batch
 Record payments to deposit in batch
 -----------------------------------
 
-:doc:`Register the payments <recording>` on the bank account on which you plan to deposit them by
+:doc:`Register the payments <../payments>` on the bank account on which you plan to deposit them by
 opening the *Customer Invoice* for which you received a payment, and clicking on *Register Payment*.
 There, select the appropriate Journal linked to your bank account and select *Batch Deposit* as
 Payment Method.
@@ -96,5 +96,5 @@ If a check, or a payment, couldn't be processed by the bank and is missing, remo
 payment before validating the bank reconciliation.
 
 .. seealso::
-   - :doc:`recording`
+   - :doc:`../payments`
    - :doc:`batch_sdd`
diff --git a/content/applications/finance/accounting/receivables/customer_payments/batch/batch-bank-reconciliation.png b/content/applications/finance/accounting/payments/batch/batch-bank-reconciliation.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_payments/batch/batch-bank-reconciliation.png
rename to content/applications/finance/accounting/payments/batch/batch-bank-reconciliation.png
diff --git a/content/applications/finance/accounting/receivables/customer_payments/batch/batch-journal-settings.png b/content/applications/finance/accounting/payments/batch/batch-journal-settings.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_payments/batch/batch-journal-settings.png
rename to content/applications/finance/accounting/payments/batch/batch-journal-settings.png
diff --git a/content/applications/finance/accounting/receivables/customer_payments/batch/batch-new-inbound.png b/content/applications/finance/accounting/payments/batch/batch-new-inbound.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_payments/batch/batch-new-inbound.png
rename to content/applications/finance/accounting/payments/batch/batch-new-inbound.png
diff --git a/content/applications/finance/accounting/receivables/customer_payments/batch/batch-payments-selection.png b/content/applications/finance/accounting/payments/batch/batch-payments-selection.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_payments/batch/batch-payments-selection.png
rename to content/applications/finance/accounting/payments/batch/batch-payments-selection.png
diff --git a/content/applications/finance/accounting/receivables/customer_payments/batch/batch-register-payment.png b/content/applications/finance/accounting/payments/batch/batch-register-payment.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_payments/batch/batch-register-payment.png
rename to content/applications/finance/accounting/payments/batch/batch-register-payment.png
diff --git a/content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst b/content/applications/finance/accounting/payments/batch_sdd.rst
similarity index 98%
rename from content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst
rename to content/applications/finance/accounting/payments/batch_sdd.rst
index ff9d6ccc5..934fa127c 100644
--- a/content/applications/finance/accounting/receivables/customer_payments/batch_sdd.rst
+++ b/content/applications/finance/accounting/payments/batch_sdd.rst
@@ -44,8 +44,7 @@ upload the signed file and click on :guilabel:`Validate` to start running the ma
 
 .. important::
    Make sure that the **IBAN bank accounts details** are correctly recorded on the debtor’s contact
-   form, under the :guilabel:`Accounting` tab, and in your own :doc:`Bank Account
-   <../../bank/setup/bank_accounts>` settings.
+   form, under the :guilabel:`Accounting` tab, and in your own :doc:`Bank Account <../bank>` settings.
 
 SEPA Direct Debit as a payment method
 -------------------------------------
@@ -120,7 +119,7 @@ Finally, upload this file to your online banking interface to process the paymen
 
 .. seealso::
    * :doc:`batch`
-   * :doc:`../../bank/setup/bank_accounts`
+   * :doc:`../bank`
    * `List of all SEPA countries
      <https://www.europeanpaymentscouncil.eu/document-library/other/epc-list-sepa-scheme-countries>`_
    * `Sepa guidelines
diff --git a/content/applications/finance/accounting/receivables/customer_payments/batch_sdd/batch-sdd-batch.png b/content/applications/finance/accounting/payments/batch_sdd/batch-sdd-batch.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_payments/batch_sdd/batch-sdd-batch.png
rename to content/applications/finance/accounting/payments/batch_sdd/batch-sdd-batch.png
diff --git a/content/applications/finance/accounting/receivables/customer_payments/batch_sdd/collect.png b/content/applications/finance/accounting/payments/batch_sdd/collect.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_payments/batch_sdd/collect.png
rename to content/applications/finance/accounting/payments/batch_sdd/collect.png
diff --git a/content/applications/finance/accounting/receivables/customer_payments/batch_sdd/creditor-identifier.png b/content/applications/finance/accounting/payments/batch_sdd/creditor-identifier.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_payments/batch_sdd/creditor-identifier.png
rename to content/applications/finance/accounting/payments/batch_sdd/creditor-identifier.png
diff --git a/content/applications/finance/accounting/receivables/customer_payments/batch_sdd/xml.png b/content/applications/finance/accounting/payments/batch_sdd/xml.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_payments/batch_sdd/xml.png
rename to content/applications/finance/accounting/payments/batch_sdd/xml.png
diff --git a/content/applications/finance/accounting/receivables/customer_payments/check.rst b/content/applications/finance/accounting/payments/checks.rst
similarity index 95%
rename from content/applications/finance/accounting/receivables/customer_payments/check.rst
rename to content/applications/finance/accounting/payments/checks.rst
index beafef4c4..d1aff4a57 100644
--- a/content/applications/finance/accounting/receivables/customer_payments/check.rst
+++ b/content/applications/finance/accounting/payments/checks.rst
@@ -1,6 +1,6 @@
-====================================
-Register customer payments by checks
-====================================
+======
+Checks
+======
 
 There are two ways to handle payments received by checks. Odoo support
 both approaches so that you can use the one that better fits your
@@ -59,8 +59,7 @@ on **Register Payment**. Fill in the information about the payment:
 
 -  Memo: write the Check number
 
-.. image:: check/check02.png
-  :align: center
+.. image:: checks/check02.png
 
 This operation will produce the following journal entry:
 
@@ -115,8 +114,7 @@ on **Register Payment**. Fill in the information about the payment:
 
 -  Memo: write the check number
 
-.. image:: check/check03.png
-  :align: center
+.. image:: checks/check03.png
 
 The invoice is marked as paid as soon as you record the check.
 
@@ -147,5 +145,4 @@ report **Bank Reconciliation Report** to verify which checks have been
 received or paid by the bank. (this report is available from the **More**
 option from the Accounting dashboard on the related bank account).
 
-.. image:: check/check01.png
-  :align: center
+.. image:: checks/check01.png
diff --git a/content/applications/finance/accounting/receivables/customer_payments/check/check01.png b/content/applications/finance/accounting/payments/checks/check01.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_payments/check/check01.png
rename to content/applications/finance/accounting/payments/checks/check01.png
diff --git a/content/applications/finance/accounting/receivables/customer_payments/check/check02.png b/content/applications/finance/accounting/payments/checks/check02.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_payments/check/check02.png
rename to content/applications/finance/accounting/payments/checks/check02.png
diff --git a/content/applications/finance/accounting/receivables/customer_payments/check/check03.png b/content/applications/finance/accounting/payments/checks/check03.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_payments/check/check03.png
rename to content/applications/finance/accounting/payments/checks/check03.png
diff --git a/content/applications/finance/accounting/receivables/customer_payments/followup.rst b/content/applications/finance/accounting/payments/follow_up.rst
similarity index 96%
rename from content/applications/finance/accounting/receivables/customer_payments/followup.rst
rename to content/applications/finance/accounting/payments/follow_up.rst
index 12815941f..3fc08143b 100644
--- a/content/applications/finance/accounting/receivables/customer_payments/followup.rst
+++ b/content/applications/finance/accounting/payments/follow_up.rst
@@ -84,8 +84,7 @@ To know whether a customer usually pays late or not, you can set a trust level b
 :guilabel:`Good Debtor`, :guilabel:`Normal Debtor`, or :guilabel:`Bad Debtor` on their follow-up
 report. To do so, click on the bullet next to the customer's name and select a trust level.
 
-.. image:: followup/debtors-trust-level.png
-    :align: center
+.. image:: follow_up/debtors-trust-level.png
     :alt: Set debtor's trust level
 
 Send reminders in batches
@@ -96,6 +95,6 @@ select all the reports you would like to process, click on the :guilabel:`Action
 select :guilabel:`Process follow-ups`.
 
 .. seealso::
-   - :doc:`../../../../general/in_app_purchase`
-   - :doc:`../../../../marketing/sms_marketing/pricing/pricing_and_faq`
+   - :doc:`../../../general/in_app_purchase`
+   - :doc:`../../../marketing/sms_marketing/pricing/pricing_and_faq`
    - :doc:`../customer_invoices/snailmail`
diff --git a/content/applications/finance/accounting/receivables/customer_payments/followup/debtors-trust-level.png b/content/applications/finance/accounting/payments/follow_up/debtors-trust-level.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_payments/followup/debtors-trust-level.png
rename to content/applications/finance/accounting/payments/follow_up/debtors-trust-level.png
diff --git a/content/applications/finance/accounting/payables/misc/forecast.rst b/content/applications/finance/accounting/payments/forecast.rst
similarity index 100%
rename from content/applications/finance/accounting/payables/misc/forecast.rst
rename to content/applications/finance/accounting/payments/forecast.rst
diff --git a/content/applications/finance/accounting/receivables/customer_payments/recording/information-icon.png b/content/applications/finance/accounting/payments/information-icon.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_payments/recording/information-icon.png
rename to content/applications/finance/accounting/payments/information-icon.png
diff --git a/content/applications/finance/accounting/bank/interbank.rst b/content/applications/finance/accounting/payments/internal_transfers.rst
similarity index 88%
rename from content/applications/finance/accounting/bank/interbank.rst
rename to content/applications/finance/accounting/payments/internal_transfers.rst
index 12af23dcb..15527f16d 100644
--- a/content/applications/finance/accounting/bank/interbank.rst
+++ b/content/applications/finance/accounting/payments/internal_transfers.rst
@@ -1,6 +1,6 @@
-=================
-Internal transfer
-=================
+==================
+Internal transfers
+==================
 
 In Odoo, internal money transfers can be made in a few clicks. You need at least either two bank
 accounts, two cash journals, or one bank account and one cash journal.
@@ -15,7 +15,7 @@ Settings` and then under the :guilabel:`Default Accounts` section.
 
 .. note::
    At least two bank accounts are needed to make internal transfers. Refer to
-   :doc:`Bank and cash accounts section <setup/bank_accounts>` to see how to add an additional bank
+   :doc:`Bank and cash accounts section <../bank>` to see how to add an additional bank
    account to your database.
 
 Register an internal transfer from one bank to another
@@ -31,7 +31,7 @@ From the Accounting Dashboard, click on the drop-down selection button (:guilabe
 your banks. In the :guilabel:`New` column click on :guilabel:`Internal Transfer` and enter the
 information related to the transfer.
 
-.. image:: interbank/internal_transfer.png
+.. image:: internal_transfers/internal_transfer.png
    :align: center
    :alt: Fill in the information related to your internal transfer
 
@@ -81,7 +81,7 @@ Automated booking - Bank journal (BANK B)
    journals, because the bank statement confirming the sending and receiving of the money has not
    been booked yet.
 
-.. image:: interbank/outstanding-payments-receipts.png
+.. image:: internal_transfers/outstanding-payments-receipts.png
    :align: center
    :alt: Outstanding Payments/Receipts pending bank statement booking
 
@@ -91,21 +91,21 @@ Manage and reconcile bank statements
 ------------------------------------
 
 The next step is to book the bank statements to finalize the transaction by creating,
-:doc:`importing <bank_statements>`, or :doc:`synchronizing <bank_synchronization>` your
+:doc:`importing <../bank/bank_statements>`, or :doc:`synchronizing <../bank/bank_synchronization>` your
 :guilabel:`Transactions lines`. Fill in the :guilabel:`Ending balance` and click on the
 :guilabel:`Reconcile` button.
 
-.. image:: interbank/transactions-line.png
+.. image:: internal_transfers/transactions-line.png
    :align: center
    :alt: Transaction lines to be filled in prior to reconciliation
 
 .. seealso::
-   :doc:`reconciliation/use_cases`
+   :doc:`../bank/reconciliation`
 
 In the next window, choose counterparts for the payment - in this example, the outstanding payment
 account - then click :guilabel:`Validate`.
 
-.. image:: interbank/bank-reconciliation.png
+.. image:: internal_transfers/bank-reconciliation.png
    :align: center
    :alt: Reconcile your payment
 
diff --git a/content/applications/finance/accounting/bank/interbank/bank-reconciliation.png b/content/applications/finance/accounting/payments/internal_transfers/bank-reconciliation.png
similarity index 100%
rename from content/applications/finance/accounting/bank/interbank/bank-reconciliation.png
rename to content/applications/finance/accounting/payments/internal_transfers/bank-reconciliation.png
diff --git a/content/applications/finance/accounting/bank/interbank/internal_transfer.png b/content/applications/finance/accounting/payments/internal_transfers/internal_transfer.png
similarity index 100%
rename from content/applications/finance/accounting/bank/interbank/internal_transfer.png
rename to content/applications/finance/accounting/payments/internal_transfers/internal_transfer.png
diff --git a/content/applications/finance/accounting/bank/interbank/outstanding-payments-receipts.png b/content/applications/finance/accounting/payments/internal_transfers/outstanding-payments-receipts.png
similarity index 100%
rename from content/applications/finance/accounting/bank/interbank/outstanding-payments-receipts.png
rename to content/applications/finance/accounting/payments/internal_transfers/outstanding-payments-receipts.png
diff --git a/content/applications/finance/accounting/bank/interbank/transactions-line.png b/content/applications/finance/accounting/payments/internal_transfers/transactions-line.png
similarity index 100%
rename from content/applications/finance/accounting/bank/interbank/transactions-line.png
rename to content/applications/finance/accounting/payments/internal_transfers/transactions-line.png
diff --git a/content/applications/finance/accounting/payables/pay/multiple.rst b/content/applications/finance/accounting/payments/multiple.rst
similarity index 83%
rename from content/applications/finance/accounting/payables/pay/multiple.rst
rename to content/applications/finance/accounting/payments/multiple.rst
index d303cbc73..e4c874dfb 100644
--- a/content/applications/finance/accounting/payables/pay/multiple.rst
+++ b/content/applications/finance/accounting/payments/multiple.rst
@@ -7,7 +7,7 @@ reconciliation process.
 
 .. seealso::
    - :doc:`/applications/inventory_and_mrp/purchase/manage_deals/manage`
-   - :doc:`/applications/finance/accounting/bank/reconciliation/use_cases`
+   - :doc:`/applications/finance/accounting/bank/reconciliation`
 
 Group payments
 ==============
@@ -44,10 +44,10 @@ Partial group payments with cash discounts
 
 In case of **partial group payments with cash discounts**, you can follow the steps found on the
 :doc:`cash discount documentation page
-</applications/finance/accounting/receivables/customer_invoices/cash_discounts>`. Make sure to
+</applications/finance/accounting/customer_invoices/cash_discounts>`. Make sure to
 apply the :doc:`payment terms
-</applications/finance/accounting/receivables/customer_invoices/payment_terms>` to the **bills**
+</applications/finance/accounting/customer_invoices/payment_terms>` to the **bills**
 *instead* of the invoices.
 
 .. seealso::
-   :doc:`/applications/finance/accounting/receivables/customer_invoices/payment_terms`
+   :doc:`/applications/finance/accounting/customer_invoices/payment_terms`
diff --git a/content/applications/finance/accounting/payables/pay/multiple/multiple-group-payments.png b/content/applications/finance/accounting/payments/multiple/multiple-group-payments.png
similarity index 100%
rename from content/applications/finance/accounting/payables/pay/multiple/multiple-group-payments.png
rename to content/applications/finance/accounting/payments/multiple/multiple-group-payments.png
diff --git a/content/applications/finance/accounting/payables/pay/multiple/register-payment-button.png b/content/applications/finance/accounting/payments/multiple/register-payment-button.png
similarity index 100%
rename from content/applications/finance/accounting/payables/pay/multiple/register-payment-button.png
rename to content/applications/finance/accounting/payments/multiple/register-payment-button.png
diff --git a/content/applications/finance/accounting/receivables/customer_payments/online_payment.rst b/content/applications/finance/accounting/payments/online.rst
similarity index 83%
rename from content/applications/finance/accounting/receivables/customer_payments/online_payment.rst
rename to content/applications/finance/accounting/payments/online.rst
index 89351ec90..744bc2e86 100644
--- a/content/applications/finance/accounting/receivables/customer_payments/online_payment.rst
+++ b/content/applications/finance/accounting/payments/online.rst
@@ -1,14 +1,13 @@
-======================
-Invoice online payment
-======================
+===============
+Online payments
+===============
 
 To make it more convenient for your customers to pay the invoices you issue, you can activate the
 **Invoice Online Payment** feature, which adds a *Pay Now* button on their **Customer Portal**. This
 allows your customers to see their invoices online and pay directly with their favorite payment
 method, making the payment process much easier.
 
-.. image:: online_payment/online-payment-acquirers.png
-   :align: center
+.. image:: online/acquirers.png
    :alt: Payment acquirer choice after having clicked on "Pay Now"
 
 Configuration
@@ -30,14 +29,12 @@ After issuing the invoice, click on *Send & Print* and send the invoice by email
 They will receive an email with a link that redirects them to the invoice on their **Customer
 Portal**.
 
-.. image:: online_payment/online-payment-view-invoice.png
-   :align: center
+.. image:: online/view-invoice.png
    :alt: Email with a link to view the invoice online on the Customer Portal.
 
 They can choose which Payment Acquirer to use by clicking on *Pay Now*.
 
-.. image:: online_payment/online-payment-pay-now.png
-   :align: center
+.. image:: online/pay-now.png
    :alt: "Pay now" button on an invoice in the Customer Portal.
 
 .. seealso::
diff --git a/content/applications/finance/accounting/receivables/customer_payments/online_payment/online-payment-acquirers.png b/content/applications/finance/accounting/payments/online/acquirers.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_payments/online_payment/online-payment-acquirers.png
rename to content/applications/finance/accounting/payments/online/acquirers.png
diff --git a/content/applications/finance/accounting/receivables/customer_payments/online_payment/online-payment-pay-now.png b/content/applications/finance/accounting/payments/online/pay-now.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_payments/online_payment/online-payment-pay-now.png
rename to content/applications/finance/accounting/payments/online/pay-now.png
diff --git a/content/applications/finance/accounting/receivables/customer_payments/online_payment/online-payment-view-invoice.png b/content/applications/finance/accounting/payments/online/view-invoice.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_payments/online_payment/online-payment-view-invoice.png
rename to content/applications/finance/accounting/payments/online/view-invoice.png
diff --git a/content/applications/finance/accounting/payables/pay/check.rst b/content/applications/finance/accounting/payments/pay_checks.rst
similarity index 100%
rename from content/applications/finance/accounting/payables/pay/check.rst
rename to content/applications/finance/accounting/payments/pay_checks.rst
diff --git a/content/applications/finance/accounting/payables/pay/sepa.rst b/content/applications/finance/accounting/payments/pay_sepa.rst
similarity index 98%
rename from content/applications/finance/accounting/payables/pay/sepa.rst
rename to content/applications/finance/accounting/payments/pay_sepa.rst
index 735ae372e..c7848d1c6 100644
--- a/content/applications/finance/accounting/payables/pay/sepa.rst
+++ b/content/applications/finance/accounting/payments/pay_sepa.rst
@@ -54,8 +54,7 @@ SCT option when paying your vendor.
 
 .. note::
    According to the localization package installed, the **SEPA Direct Debit** and **SEPA Credit
-   Transfer** modules may be installed by default. If not, they need to be :doc:`installed
-   <../../../../general/apps_modules>`.
+   Transfer** modules may be installed by default. If not, they need to be :ref:`installed <general/install>`.
 
 Activate SEPA payment methods on banks
 --------------------------------------
diff --git a/content/applications/finance/accounting/receivables/customer_payments/recording/reconcile-option.png b/content/applications/finance/accounting/payments/reconcile-option.png
similarity index 100%
rename from content/applications/finance/accounting/receivables/customer_payments/recording/reconcile-option.png
rename to content/applications/finance/accounting/payments/reconcile-option.png
diff --git a/content/applications/finance/accounting/receivables.rst b/content/applications/finance/accounting/receivables.rst
deleted file mode 100644
index e444f36c0..000000000
--- a/content/applications/finance/accounting/receivables.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-:nosearch:
-
-===================
-Account receivables
-===================
-
-.. toctree::
-   :titlesonly:
-
-   receivables/customer_invoices
-   receivables/customer_payments
diff --git a/content/applications/finance/accounting/receivables/customer_invoices.rst b/content/applications/finance/accounting/receivables/customer_invoices.rst
deleted file mode 100644
index afa9e2590..000000000
--- a/content/applications/finance/accounting/receivables/customer_invoices.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-:nosearch:
-
-=================
-Customer invoices
-=================
-
-.. toctree::
-   :titlesonly:
-
-   customer_invoices/overview
-   customer_invoices/cash_discounts
-   customer_invoices/cash_rounding
-   customer_invoices/payment_terms
-   customer_invoices/deferred_revenues
-   customer_invoices/credit_notes
-   customer_invoices/epc_qr_code
-   customer_invoices/snailmail
-   customer_invoices/electronic_invoicing
diff --git a/content/applications/finance/accounting/receivables/customer_payments.rst b/content/applications/finance/accounting/receivables/customer_payments.rst
deleted file mode 100644
index 9517f3dc6..000000000
--- a/content/applications/finance/accounting/receivables/customer_payments.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-:nosearch:
-
-=================
-Customer payments
-=================
-
-.. toctree::
-   :titlesonly:
-
-   customer_payments/recording
-   customer_payments/online_payment
-   customer_payments/check
-   customer_payments/batch
-   customer_payments/batch_sdd
-   customer_payments/followup
diff --git a/content/applications/finance/accounting/reporting.rst b/content/applications/finance/accounting/reporting.rst
index 1a83f5ea2..76d0e3832 100644
--- a/content/applications/finance/accounting/reporting.rst
+++ b/content/applications/finance/accounting/reporting.rst
@@ -1,12 +1,155 @@
-:nosearch:
+:show-content:
 
 =========
 Reporting
 =========
 
+Main reports available
+======================
+
+Besides the reports created specifically in each localisation module, a
+few very useful **generic** and **dynamic reports** are available for all
+countries :
+
+-  **Balance Sheet**
+-  **Profit and Loss**
+-  **Executive Summary**
+-  **General Ledger**
+-  **Aged Payable**
+-  **Aged Receivable**
+-  **Cash Flow Statement**
+-  **Tax Report**
+-  **Bank Reconciliation**
+
+You can annotate every reports to print them and report to your adviser.
+Export to xls to manage extra analysis. Drill down in the reports to see
+more details (payments, invoices, journal items, etc.).
+
+You can also compare values with another period. Choose how many periods
+you want to compare the chosen time period with. You can choose up to 12
+periods back from the date of the report if you don't want to use the
+default **Previous 1 Period** option.
+
+Balance Sheet
+-------------
+
+The **Balance Sheet** shows a snapshot of the assets, liabilities and equity
+of your organisation as at a particular date.
+
+.. image:: reporting/main_reports09.png
+
+Profit and Loss
+---------------
+
+The **Profit and Loss** report (or **Income Statement**) shows your
+organisation's net income, by deducting expenses from revenue for the
+report period.
+
+.. image:: reporting/main_reports10.png
+
+Executive Summary
+-----------------
+
+The **Executive Summary** allows for a quick look at all the important
+figures you need to run your company.
+
+In very basic terms, this is what each of the items in this section is
+reporting :
+
+- **Performance:**
+    - **Gross profit margin:**
+        The contribution each individual sale made
+        by your business less any direct costs needed to make those sales
+        (things like labour, materials, etc).
+    - **Net profit margin:**
+        The contribution each individual sale made by
+        your business less any direct costs needed to make those sales,
+        as well as any fixed overheads your company has (things like
+        rent, electricity, taxes you need to pay as a result of those
+        sales).
+    - **Return on investment (p.a.):**
+        The ratio of net profit made, to the
+        amount of assets the company used to make those profits.
+- **Position:**
+    - **Average debtor days:**
+        The average number of days it takes your
+        customers to pay you (fully), across all your customer invoices.
+    - **Average creditor days:**
+        The average number of days it takes you to
+        pay your suppliers (fully) across all your bills.
+    - **Short term cash forecast:**
+        How much cash is expected in or out of
+        your organisation in the next month i.e. balance of your **Sales
+        account** for the month less the balance of your **Purchases account**
+        for the month.
+    - **Current assets to liabilities:**
+        Also referred to as **current ratio**, this is the ratio
+        of current assets (assets that could be
+        turned into cash within a year) to the current liabilities
+        (liabilities which will be due in the next year). This is
+        typically used as as a measure of a company's ability to service
+        its debt.
+
+.. image:: reporting/main_reports01.png
+
+General Ledger
+--------------
+
+The **General Ledger Report** shows all transactions from all accounts for a
+chosen date range. The initial summary report shows the totals for each
+account and from there you can view a detailed transaction report or any
+exceptions. This report is useful for checking every transaction that
+occurred during a certain period of time.
+
+.. image:: reporting/main_reports05.png
+
+Aged Payable
+------------
+
+Run the **Aged Payable Details** report to display information on individual
+bills, credit notes and overpayments owed by you, and how long these
+have gone unpaid.
+
+.. image:: reporting/main_reports02.png
+
+Aged Receivable
+---------------
+
+The **Aged Receivables** report shows the sales invoices that were awaiting
+payment during a selected month and several months prior.
+
+.. image:: reporting/main_reports07.png
+
+Cash Flow Statement
+-------------------
+
+The **Cash Flow Statement** shows how changes in balance sheet accounts and
+income affect cash and cash equivalents, and breaks the analysis down to
+operating, investing and financing activities.
+
+.. image:: reporting/main_reports03.png
+
+Tax Report
+----------
+
+This report allows you to see the **net** and **tax amounts** for all the taxes
+grouped by type (sale/purchase).
+
+.. image:: reporting/main_reports04.png
+
+Bank Reconciliation
+-------------------
+
+.. image:: reporting/main_reports06.png
+
 .. toctree::
    :titlesonly:
 
-   reporting/overview
-   reporting/declarations
+   reporting/tax_returns
+   reporting/analytic
+   reporting/budget
+   reporting/intrastat
+   reporting/data_inalterability
    reporting/silverfin
+   reporting/customize
+   reporting/year_end
diff --git a/content/applications/finance/accounting/others/analytic/usage.rst b/content/applications/finance/accounting/reporting/analytic.rst
similarity index 96%
rename from content/applications/finance/accounting/others/analytic/usage.rst
rename to content/applications/finance/accounting/reporting/analytic.rst
index 0dec00354..350c371bc 100644
--- a/content/applications/finance/accounting/others/analytic/usage.rst
+++ b/content/applications/finance/accounting/reporting/analytic.rst
@@ -1,6 +1,12 @@
-==========================
-Analytic account use cases
-==========================
+:show-content:
+
+===================
+Analytic accounting
+===================
+
+.. seealso::
+   - :doc:`analytic/timesheets`
+   - :doc:`analytic/purchases_expenses`
 
 The analytic accounting can be used for several purposes:
 
@@ -13,8 +19,7 @@ The analytic accounting can be used for several purposes:
 To manage analytic accounting, you have to activate it in
 :menuselection:`Configuration --> Settings`:
 
-.. image:: usage/usage01.png
-   :align: center
+.. image:: analytic/usage01.png
 
 To illustrate analytic accounts clearly, you will follow three use
 cases, each in one of three different types of company:
@@ -88,8 +93,7 @@ The analytic representation by department enables you to investigate the
 costs allocated to each department in the company. The analytic chart of
 accounts shows the distribution of the company's costs using the example above:
 
-.. image:: usage/usage02.png
-   :align: center
+.. image:: analytic/usage02.png
 
 In this example of a hierarchical structure in Odoo, you can analyse not
 only the costs of each product range, but also the costs of the whole
@@ -97,8 +101,7 @@ production. A report that relates both general accounts and analytic
 accounts enables you to get a breakdown of costs within a given
 department.
 
-.. image:: usage/usage03.png
-   :align: center
+.. image:: analytic/usage03.png
 
 The examples above are based on a breakdown of the costs of the company.
 Analytic allocations can be just as effective for sales. That gives you
@@ -175,7 +178,7 @@ Such a structure allows you to make a detailed study of the
 profitability of various transactions.
 
 For more details about profitablity, please read the following document:
-:doc:`timesheets`
+:doc:`analytic/timesheets`
 
 But analytical accounting is not limited to a simple analysis of the
 profitability of different customer. The same data can be used for
@@ -222,3 +225,9 @@ production performance.
 
 Analytic accounting is flexible and easy to use through all Odoo
 applications (sales, purchase, timesheet, production, invoice, …).
+
+.. toctree::
+   :titlesonly:
+
+   analytic/timesheets
+   analytic/purchases_expenses
\ No newline at end of file
diff --git a/content/applications/finance/accounting/others/analytic/purchases_expenses.rst b/content/applications/finance/accounting/reporting/analytic/purchases_expenses.rst
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/purchases_expenses.rst
rename to content/applications/finance/accounting/reporting/analytic/purchases_expenses.rst
diff --git a/content/applications/finance/accounting/others/analytic/purchases_expenses/purchase01.png b/content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase01.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/purchases_expenses/purchase01.png
rename to content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase01.png
diff --git a/content/applications/finance/accounting/others/analytic/purchases_expenses/purchase02.png b/content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase02.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/purchases_expenses/purchase02.png
rename to content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase02.png
diff --git a/content/applications/finance/accounting/others/analytic/purchases_expenses/purchase03.png b/content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase03.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/purchases_expenses/purchase03.png
rename to content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase03.png
diff --git a/content/applications/finance/accounting/others/analytic/purchases_expenses/purchase04.png b/content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase04.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/purchases_expenses/purchase04.png
rename to content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase04.png
diff --git a/content/applications/finance/accounting/others/analytic/purchases_expenses/purchase05.png b/content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase05.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/purchases_expenses/purchase05.png
rename to content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase05.png
diff --git a/content/applications/finance/accounting/others/analytic/purchases_expenses/purchase06.png b/content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase06.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/purchases_expenses/purchase06.png
rename to content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase06.png
diff --git a/content/applications/finance/accounting/others/analytic/purchases_expenses/purchase07.png b/content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase07.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/purchases_expenses/purchase07.png
rename to content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase07.png
diff --git a/content/applications/finance/accounting/others/analytic/purchases_expenses/purchase08.png b/content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase08.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/purchases_expenses/purchase08.png
rename to content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase08.png
diff --git a/content/applications/finance/accounting/others/analytic/purchases_expenses/purchase09.png b/content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase09.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/purchases_expenses/purchase09.png
rename to content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase09.png
diff --git a/content/applications/finance/accounting/others/analytic/purchases_expenses/purchase10.png b/content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase10.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/purchases_expenses/purchase10.png
rename to content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase10.png
diff --git a/content/applications/finance/accounting/others/analytic/purchases_expenses/purchase11.png b/content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase11.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/purchases_expenses/purchase11.png
rename to content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase11.png
diff --git a/content/applications/finance/accounting/others/analytic/timesheets.rst b/content/applications/finance/accounting/reporting/analytic/timesheets.rst
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/timesheets.rst
rename to content/applications/finance/accounting/reporting/analytic/timesheets.rst
diff --git a/content/applications/finance/accounting/others/analytic/timesheets/timesheets01.png b/content/applications/finance/accounting/reporting/analytic/timesheets/timesheets01.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/timesheets/timesheets01.png
rename to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets01.png
diff --git a/content/applications/finance/accounting/others/analytic/timesheets/timesheets02.png b/content/applications/finance/accounting/reporting/analytic/timesheets/timesheets02.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/timesheets/timesheets02.png
rename to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets02.png
diff --git a/content/applications/finance/accounting/others/analytic/timesheets/timesheets03.png b/content/applications/finance/accounting/reporting/analytic/timesheets/timesheets03.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/timesheets/timesheets03.png
rename to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets03.png
diff --git a/content/applications/finance/accounting/others/analytic/timesheets/timesheets04.png b/content/applications/finance/accounting/reporting/analytic/timesheets/timesheets04.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/timesheets/timesheets04.png
rename to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets04.png
diff --git a/content/applications/finance/accounting/others/analytic/timesheets/timesheets05.png b/content/applications/finance/accounting/reporting/analytic/timesheets/timesheets05.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/timesheets/timesheets05.png
rename to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets05.png
diff --git a/content/applications/finance/accounting/others/analytic/timesheets/timesheets06.png b/content/applications/finance/accounting/reporting/analytic/timesheets/timesheets06.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/timesheets/timesheets06.png
rename to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets06.png
diff --git a/content/applications/finance/accounting/others/analytic/timesheets/timesheets07.png b/content/applications/finance/accounting/reporting/analytic/timesheets/timesheets07.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/timesheets/timesheets07.png
rename to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets07.png
diff --git a/content/applications/finance/accounting/others/analytic/timesheets/timesheets08.png b/content/applications/finance/accounting/reporting/analytic/timesheets/timesheets08.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/timesheets/timesheets08.png
rename to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets08.png
diff --git a/content/applications/finance/accounting/others/analytic/timesheets/timesheets09.png b/content/applications/finance/accounting/reporting/analytic/timesheets/timesheets09.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/timesheets/timesheets09.png
rename to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets09.png
diff --git a/content/applications/finance/accounting/others/analytic/timesheets/timesheets10.png b/content/applications/finance/accounting/reporting/analytic/timesheets/timesheets10.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/timesheets/timesheets10.png
rename to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets10.png
diff --git a/content/applications/finance/accounting/others/analytic/timesheets/timesheets11.png b/content/applications/finance/accounting/reporting/analytic/timesheets/timesheets11.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/timesheets/timesheets11.png
rename to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets11.png
diff --git a/content/applications/finance/accounting/others/analytic/timesheets/timesheets12.png b/content/applications/finance/accounting/reporting/analytic/timesheets/timesheets12.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/timesheets/timesheets12.png
rename to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets12.png
diff --git a/content/applications/finance/accounting/others/analytic/timesheets/timesheets13.png b/content/applications/finance/accounting/reporting/analytic/timesheets/timesheets13.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/timesheets/timesheets13.png
rename to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets13.png
diff --git a/content/applications/finance/accounting/others/analytic/timesheets/timesheets14.png b/content/applications/finance/accounting/reporting/analytic/timesheets/timesheets14.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/timesheets/timesheets14.png
rename to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets14.png
diff --git a/content/applications/finance/accounting/others/analytic/usage/usage01.png b/content/applications/finance/accounting/reporting/analytic/usage01.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/usage/usage01.png
rename to content/applications/finance/accounting/reporting/analytic/usage01.png
diff --git a/content/applications/finance/accounting/others/analytic/usage/usage02.png b/content/applications/finance/accounting/reporting/analytic/usage02.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/usage/usage02.png
rename to content/applications/finance/accounting/reporting/analytic/usage02.png
diff --git a/content/applications/finance/accounting/others/analytic/usage/usage03.png b/content/applications/finance/accounting/reporting/analytic/usage03.png
similarity index 100%
rename from content/applications/finance/accounting/others/analytic/usage/usage03.png
rename to content/applications/finance/accounting/reporting/analytic/usage03.png
diff --git a/content/applications/finance/accounting/others/adviser/budget.rst b/content/applications/finance/accounting/reporting/budget.rst
similarity index 100%
rename from content/applications/finance/accounting/others/adviser/budget.rst
rename to content/applications/finance/accounting/reporting/budget.rst
diff --git a/content/applications/finance/accounting/others/adviser/budget/analytic-accounts.png b/content/applications/finance/accounting/reporting/budget/analytic-accounts.png
similarity index 100%
rename from content/applications/finance/accounting/others/adviser/budget/analytic-accounts.png
rename to content/applications/finance/accounting/reporting/budget/analytic-accounts.png
diff --git a/content/applications/finance/accounting/others/adviser/budget/define-the-budget.png b/content/applications/finance/accounting/reporting/budget/define-the-budget.png
similarity index 100%
rename from content/applications/finance/accounting/others/adviser/budget/define-the-budget.png
rename to content/applications/finance/accounting/reporting/budget/define-the-budget.png
diff --git a/content/applications/finance/accounting/others/adviser/budget/smith-and-co-expenses.png b/content/applications/finance/accounting/reporting/budget/smith-and-co-expenses.png
similarity index 100%
rename from content/applications/finance/accounting/others/adviser/budget/smith-and-co-expenses.png
rename to content/applications/finance/accounting/reporting/budget/smith-and-co-expenses.png
diff --git a/content/applications/finance/accounting/others/adviser/budget/smith-and-co-revenue.png b/content/applications/finance/accounting/reporting/budget/smith-and-co-revenue.png
similarity index 100%
rename from content/applications/finance/accounting/others/adviser/budget/smith-and-co-revenue.png
rename to content/applications/finance/accounting/reporting/budget/smith-and-co-revenue.png
diff --git a/content/applications/finance/accounting/reporting/overview/customize.rst b/content/applications/finance/accounting/reporting/customize.rst
similarity index 94%
rename from content/applications/finance/accounting/reporting/overview/customize.rst
rename to content/applications/finance/accounting/reporting/customize.rst
index 17c19cb7a..2bbecedc6 100644
--- a/content/applications/finance/accounting/reporting/overview/customize.rst
+++ b/content/applications/finance/accounting/reporting/customize.rst
@@ -1,6 +1,6 @@
-==================================================
-Create a customized reports with your own formulas
-==================================================
+==============
+Custom reports
+==============
 
 Overview
 ========
@@ -87,4 +87,4 @@ Other useful fields :
    (always displayed) or ``never`` (never shown).
 
 .. seealso::
-    * :doc:`main_reports`
+    * :doc:`..`
diff --git a/content/applications/finance/accounting/reporting/overview/customize/customize02.png b/content/applications/finance/accounting/reporting/customize/customize02.png
similarity index 100%
rename from content/applications/finance/accounting/reporting/overview/customize/customize02.png
rename to content/applications/finance/accounting/reporting/customize/customize02.png
diff --git a/content/applications/finance/accounting/reporting/overview/customize/customize04.png b/content/applications/finance/accounting/reporting/customize/customize04.png
similarity index 100%
rename from content/applications/finance/accounting/reporting/overview/customize/customize04.png
rename to content/applications/finance/accounting/reporting/customize/customize04.png
diff --git a/content/applications/finance/accounting/reporting/overview/data_inalterability.rst b/content/applications/finance/accounting/reporting/data_inalterability.rst
similarity index 100%
rename from content/applications/finance/accounting/reporting/overview/data_inalterability.rst
rename to content/applications/finance/accounting/reporting/data_inalterability.rst
diff --git a/content/applications/finance/accounting/reporting/overview/data_inalterability/data-consistency-check.png b/content/applications/finance/accounting/reporting/data_inalterability/data-consistency-check.png
similarity index 100%
rename from content/applications/finance/accounting/reporting/overview/data_inalterability/data-consistency-check.png
rename to content/applications/finance/accounting/reporting/data_inalterability/data-consistency-check.png
diff --git a/content/applications/finance/accounting/reporting/overview/data_inalterability/journal-overview.png b/content/applications/finance/accounting/reporting/data_inalterability/journal-overview.png
similarity index 100%
rename from content/applications/finance/accounting/reporting/overview/data_inalterability/journal-overview.png
rename to content/applications/finance/accounting/reporting/data_inalterability/journal-overview.png
diff --git a/content/applications/finance/accounting/reporting/declarations.rst b/content/applications/finance/accounting/reporting/declarations.rst
deleted file mode 100644
index d9073d2c4..000000000
--- a/content/applications/finance/accounting/reporting/declarations.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-:nosearch:
-
-============
-Declarations
-============
-
-.. toctree::
-   :titlesonly:
-
-   declarations/tax_returns
-   declarations/intrastat
diff --git a/content/applications/finance/accounting/reporting/declarations/intrastat.rst b/content/applications/finance/accounting/reporting/intrastat.rst
similarity index 100%
rename from content/applications/finance/accounting/reporting/declarations/intrastat.rst
rename to content/applications/finance/accounting/reporting/intrastat.rst
diff --git a/content/applications/finance/accounting/reporting/overview/main_reports/main_reports01.png b/content/applications/finance/accounting/reporting/main_reports01.png
similarity index 100%
rename from content/applications/finance/accounting/reporting/overview/main_reports/main_reports01.png
rename to content/applications/finance/accounting/reporting/main_reports01.png
diff --git a/content/applications/finance/accounting/reporting/overview/main_reports/main_reports02.png b/content/applications/finance/accounting/reporting/main_reports02.png
similarity index 100%
rename from content/applications/finance/accounting/reporting/overview/main_reports/main_reports02.png
rename to content/applications/finance/accounting/reporting/main_reports02.png
diff --git a/content/applications/finance/accounting/reporting/overview/main_reports/main_reports03.png b/content/applications/finance/accounting/reporting/main_reports03.png
similarity index 100%
rename from content/applications/finance/accounting/reporting/overview/main_reports/main_reports03.png
rename to content/applications/finance/accounting/reporting/main_reports03.png
diff --git a/content/applications/finance/accounting/reporting/overview/main_reports/main_reports04.png b/content/applications/finance/accounting/reporting/main_reports04.png
similarity index 100%
rename from content/applications/finance/accounting/reporting/overview/main_reports/main_reports04.png
rename to content/applications/finance/accounting/reporting/main_reports04.png
diff --git a/content/applications/finance/accounting/reporting/overview/main_reports/main_reports05.png b/content/applications/finance/accounting/reporting/main_reports05.png
similarity index 100%
rename from content/applications/finance/accounting/reporting/overview/main_reports/main_reports05.png
rename to content/applications/finance/accounting/reporting/main_reports05.png
diff --git a/content/applications/finance/accounting/reporting/overview/main_reports/main_reports06.png b/content/applications/finance/accounting/reporting/main_reports06.png
similarity index 100%
rename from content/applications/finance/accounting/reporting/overview/main_reports/main_reports06.png
rename to content/applications/finance/accounting/reporting/main_reports06.png
diff --git a/content/applications/finance/accounting/reporting/overview/main_reports/main_reports07.png b/content/applications/finance/accounting/reporting/main_reports07.png
similarity index 100%
rename from content/applications/finance/accounting/reporting/overview/main_reports/main_reports07.png
rename to content/applications/finance/accounting/reporting/main_reports07.png
diff --git a/content/applications/finance/accounting/reporting/overview/main_reports/main_reports09.png b/content/applications/finance/accounting/reporting/main_reports09.png
similarity index 100%
rename from content/applications/finance/accounting/reporting/overview/main_reports/main_reports09.png
rename to content/applications/finance/accounting/reporting/main_reports09.png
diff --git a/content/applications/finance/accounting/reporting/overview/main_reports/main_reports10.png b/content/applications/finance/accounting/reporting/main_reports10.png
similarity index 100%
rename from content/applications/finance/accounting/reporting/overview/main_reports/main_reports10.png
rename to content/applications/finance/accounting/reporting/main_reports10.png
diff --git a/content/applications/finance/accounting/reporting/overview.rst b/content/applications/finance/accounting/reporting/overview.rst
deleted file mode 100644
index d44b01a82..000000000
--- a/content/applications/finance/accounting/reporting/overview.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-:nosearch:
-
-========
-Overview
-========
-
-.. toctree::
-   :titlesonly:
-
-   overview/main_reports
-   overview/customize
-   overview/data_inalterability
diff --git a/content/applications/finance/accounting/reporting/overview/main_reports.rst b/content/applications/finance/accounting/reporting/overview/main_reports.rst
deleted file mode 100644
index 9565a0650..000000000
--- a/content/applications/finance/accounting/reporting/overview/main_reports.rst
+++ /dev/null
@@ -1,147 +0,0 @@
-======================
-Main reports available
-======================
-
-Besides the reports created specifically in each localisation module, a
-few very useful **generic** and **dynamic reports** are available for all
-countries :
-
--  **Balance Sheet**
--  **Profit and Loss**
--  **Executive Summary**
--  **General Ledger**
--  **Aged Payable**
--  **Aged Receivable**
--  **Cash Flow Statement**
--  **Tax Report**
--  **Bank Reconciliation**
-
-You can annotate every reports to print them and report to your adviser.
-Export to xls to manage extra analysis. Drill down in the reports to see
-more details (payments, invoices, journal items, etc.).
-
-You can also compare values with another period. Choose how many periods
-you want to compare the chosen time period with. You can choose up to 12
-periods back from the date of the report if you don't want to use the
-default **Previous 1 Period** option.
-
-Balance Sheet
--------------
-
-The **Balance Sheet** shows a snapshot of the assets, liabilities and equity
-of your organisation as at a particular date.
-
-.. image:: main_reports/main_reports09.png
-   :align: center
-
-Profit and Loss
----------------
-
-The **Profit and Loss** report (or **Income Statement**) shows your
-organisation's net income, by deducting expenses from revenue for the
-report period.
-
-.. image:: main_reports/main_reports10.png
-   :align: center
-
-Executive Summary
------------------
-
-The **Executive Summary** allows for a quick look at all the important
-figures you need to run your company.
-
-In very basic terms, this is what each of the items in this section is
-reporting :
-
-- **Performance:**
-    - **Gross profit margin:**
-        The contribution each individual sale made
-        by your business less any direct costs needed to make those sales
-        (things like labour, materials, etc).
-    - **Net profit margin:**
-        The contribution each individual sale made by
-        your business less any direct costs needed to make those sales,
-        as well as any fixed overheads your company has (things like
-        rent, electricity, taxes you need to pay as a result of those
-        sales).
-    - **Return on investment (p.a.):**
-        The ratio of net profit made, to the
-        amount of assets the company used to make those profits.
-- **Position:**
-    - **Average debtor days:**
-        The average number of days it takes your
-        customers to pay you (fully), across all your customer invoices.
-    - **Average creditor days:**
-        The average number of days it takes you to
-        pay your suppliers (fully) across all your bills.
-    - **Short term cash forecast:**
-        How much cash is expected in or out of
-        your organisation in the next month i.e. balance of your **Sales
-        account** for the month less the balance of your **Purchases account**
-        for the month.
-    - **Current assets to liabilities:**
-        Also referred to as **current ratio**, this is the ratio
-        of current assets (assets that could be
-        turned into cash within a year) to the current liabilities
-        (liabilities which will be due in the next year). This is
-        typically used as as a measure of a company's ability to service
-        its debt.
-
-.. image:: main_reports/main_reports01.png
-   :align: center
-
-General Ledger
---------------
-
-The **General Ledger Report** shows all transactions from all accounts for a
-chosen date range. The initial summary report shows the totals for each
-account and from there you can view a detailed transaction report or any
-exceptions. This report is useful for checking every transaction that
-occurred during a certain period of time.
-
-.. image:: main_reports/main_reports05.png
-   :align: center
-
-Aged Payable
-------------
-
-Run the **Aged Payable Details** report to display information on individual
-bills, credit notes and overpayments owed by you, and how long these
-have gone unpaid.
-
-.. image:: main_reports/main_reports02.png
-   :align: center
-
-Aged Receivable
----------------
-
-The **Aged Receivables** report shows the sales invoices that were awaiting
-payment during a selected month and several months prior.
-
-.. image:: main_reports/main_reports07.png
-   :align: center
-
-Cash Flow Statement
--------------------
-
-The **Cash Flow Statement** shows how changes in balance sheet accounts and
-income affect cash and cash equivalents, and breaks the analysis down to
-operating, investing and financing activities.
-
-.. image:: main_reports/main_reports03.png
-   :align: center
-
-Tax Report
-----------
-
-This report allows you to see the **net** and **tax amounts** for all the taxes
-grouped by type (sale/purchase).
-
-.. image:: main_reports/main_reports04.png
-   :align: center
-
-Bank Reconciliation
--------------------
-
-.. image:: main_reports/main_reports06.png
-   :align: center
diff --git a/content/applications/finance/accounting/reporting/declarations/tax_returns.rst b/content/applications/finance/accounting/reporting/tax_returns.rst
similarity index 96%
rename from content/applications/finance/accounting/reporting/declarations/tax_returns.rst
rename to content/applications/finance/accounting/reporting/tax_returns.rst
index bc35c41fc..3c723ac45 100644
--- a/content/applications/finance/accounting/reporting/declarations/tax_returns.rst
+++ b/content/applications/finance/accounting/reporting/tax_returns.rst
@@ -40,8 +40,7 @@ To do so, go to :menuselection:`Accounting --> Configuration --> Settings`. Unde
    :alt: Configure how often tax returns have to be made in Odoo Accounting
 
 .. note::
-   This is usually configured during the :doc:`app's initial set up
-   <../../getting_started/initial_configuration/setup>`.
+   This is usually configured during the :doc:`app's initial set up <../get_started>`.
 
 .. _tax-returns/tax-grids:
 
@@ -119,6 +118,6 @@ report to the tax authorities, along with the amount you have to pay or be refun
    date manually before, as described above.
 
 .. seealso::
-   * :doc:`../../taxation/taxes/taxes`
-   * :doc:`../../getting_started/initial_configuration/setup`
-   * :doc:`../../../fiscal_localizations`
+   * :doc:`../taxes`
+   * :doc:`../get_started`
+   * :doc:`../../fiscal_localizations`
diff --git a/content/applications/finance/accounting/reporting/declarations/tax_returns/tax_return_grids.png b/content/applications/finance/accounting/reporting/tax_returns/tax_return_grids.png
similarity index 100%
rename from content/applications/finance/accounting/reporting/declarations/tax_returns/tax_return_grids.png
rename to content/applications/finance/accounting/reporting/tax_returns/tax_return_grids.png
diff --git a/content/applications/finance/accounting/reporting/declarations/tax_returns/tax_return_lock.png b/content/applications/finance/accounting/reporting/tax_returns/tax_return_lock.png
similarity index 100%
rename from content/applications/finance/accounting/reporting/declarations/tax_returns/tax_return_lock.png
rename to content/applications/finance/accounting/reporting/tax_returns/tax_return_lock.png
diff --git a/content/applications/finance/accounting/reporting/declarations/tax_returns/tax_return_periodicity.png b/content/applications/finance/accounting/reporting/tax_returns/tax_return_periodicity.png
similarity index 100%
rename from content/applications/finance/accounting/reporting/declarations/tax_returns/tax_return_periodicity.png
rename to content/applications/finance/accounting/reporting/tax_returns/tax_return_periodicity.png
diff --git a/content/applications/finance/accounting/reporting/declarations/tax_returns/tax_return_report.png b/content/applications/finance/accounting/reporting/tax_returns/tax_return_report.png
similarity index 100%
rename from content/applications/finance/accounting/reporting/declarations/tax_returns/tax_return_report.png
rename to content/applications/finance/accounting/reporting/tax_returns/tax_return_report.png
diff --git a/content/applications/finance/accounting/reporting/declarations/tax_returns/tax_return_taxes.png b/content/applications/finance/accounting/reporting/tax_returns/tax_return_taxes.png
similarity index 100%
rename from content/applications/finance/accounting/reporting/declarations/tax_returns/tax_return_taxes.png
rename to content/applications/finance/accounting/reporting/tax_returns/tax_return_taxes.png
diff --git a/content/applications/finance/accounting/taxation/fiscal_year/close_fiscal_year.rst b/content/applications/finance/accounting/reporting/year_end.rst
similarity index 78%
rename from content/applications/finance/accounting/taxation/fiscal_year/close_fiscal_year.rst
rename to content/applications/finance/accounting/reporting/year_end.rst
index 4f1178e20..9e21aa539 100644
--- a/content/applications/finance/accounting/taxation/fiscal_year/close_fiscal_year.rst
+++ b/content/applications/finance/accounting/reporting/year_end.rst
@@ -1,6 +1,6 @@
-===========================================
-Do a year end in Odoo (close a fiscal year)
-===========================================
+================
+Year-end closing
+================
 
 Before going ahead with closing a fiscal year, there are a few steps one
 should typically take to ensure that your accounting is correct, up to
@@ -19,6 +19,31 @@ date, and accurate:
 - Corroborate that all **received payments** have been entered and
   recorded accurately.
 
+.. _year-end/fiscal-years:
+
+Manage fiscal years
+===================
+
+In most cases, the fiscal years last 12 months. If it is your case, you
+just have to define what is the last day of your fiscal year in the
+accounting settings. By default, it is set on the 31st December.
+
+However, there might be some exceptions. For example, if it is the first
+fiscal year of your business, it could last more or less than 12 months.
+In this case, some additional configuration is required.
+
+Go to :menuselection:`accounting --> configuration --> settings` and activate
+the fiscal years.
+
+You can then configure your fiscal years in
+:menuselection:`accounting --> configuration --> fiscal years`.
+
+.. note::
+    You only have to create fiscal years if they last more or less
+    than 12 months.
+
+.. _year-end/checklist:
+
 Year-end checklist
 ==================
 
@@ -70,8 +95,9 @@ set under the accounting configuration. This way, the accountant can be
 confident that nobody is changing the previous year transactions
 while auditing the books.
 
-.. image:: close_fiscal_year/close_fiscal_year01.png
-   :align: center
+.. image:: year_end/close_fiscal_year01.png
+
+.. _year-end/closing:
 
 Closing the fiscal year
 =======================
@@ -88,6 +114,3 @@ the **Current Year Earnings**, you should set the **Lock Date** to the last day
 of the fiscal year. Making sure that before doing so, you confirm
 whether or not the current year earnings in the **Balance Sheet** is
 correctly reporting a 0 balance.
-
-.. seealso::
-  * :doc:`fiscal_year`
diff --git a/content/applications/finance/accounting/taxation/fiscal_year/close_fiscal_year/close_fiscal_year01.png b/content/applications/finance/accounting/reporting/year_end/close_fiscal_year01.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/fiscal_year/close_fiscal_year/close_fiscal_year01.png
rename to content/applications/finance/accounting/reporting/year_end/close_fiscal_year01.png
diff --git a/content/applications/finance/accounting/taxation.rst b/content/applications/finance/accounting/taxation.rst
deleted file mode 100644
index 722651241..000000000
--- a/content/applications/finance/accounting/taxation.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-:nosearch:
-
-========
-Taxation
-========
-
-.. toctree::
-   :titlesonly:
-
-   taxation/taxes
-   taxation/fiscal_year
diff --git a/content/applications/finance/accounting/taxation/fiscal_year.rst b/content/applications/finance/accounting/taxation/fiscal_year.rst
deleted file mode 100644
index ee28c71d4..000000000
--- a/content/applications/finance/accounting/taxation/fiscal_year.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-:nosearch:
-
-===========
-Fiscal year
-===========
-
-.. toctree::
-   :titlesonly:
-
-   fiscal_year/fiscal_year
-   fiscal_year/close_fiscal_year
diff --git a/content/applications/finance/accounting/taxation/fiscal_year/fiscal_year.rst b/content/applications/finance/accounting/taxation/fiscal_year/fiscal_year.rst
deleted file mode 100644
index d9429b0c7..000000000
--- a/content/applications/finance/accounting/taxation/fiscal_year/fiscal_year.rst
+++ /dev/null
@@ -1,34 +0,0 @@
-===================
-Manage Fiscal Years
-===================
-
-In most cases, the fiscal years last 12 months. If it is your case, you
-just have to define what is the last day of your fiscal year in the
-accounting settings. By default, it is set on the 31st December.
-
-.. image:: fiscal_year/fiscal_year01.png
-    :align: center
-
-However, there might be some exceptions. For example, if it is the first
-fiscal year of your business, it could last more or less than 12 months.
-In this case, some additional configuration is required.
-
-Go in :menuselection:`accounting --> configuration --> settings` and activate
-the fiscal years.
-
-.. image:: fiscal_year/fiscal_year02.png
-    :align: center
-
-You can then configure your fiscal years in
-:menuselection:`accounting --> configuration --> fiscal years`.
-
-.. image:: fiscal_year/fiscal_year03.png
-    :align: center
-
-.. note::
-    You only have to create fiscal years if they last more or less
-    than 12 months.
-
-.. seealso::
-
-    * :doc:`close_fiscal_year`
diff --git a/content/applications/finance/accounting/taxation/fiscal_year/fiscal_year/fiscal_year01.png b/content/applications/finance/accounting/taxation/fiscal_year/fiscal_year/fiscal_year01.png
deleted file mode 100644
index 7def9ae80..000000000
Binary files a/content/applications/finance/accounting/taxation/fiscal_year/fiscal_year/fiscal_year01.png and /dev/null differ
diff --git a/content/applications/finance/accounting/taxation/fiscal_year/fiscal_year/fiscal_year02.png b/content/applications/finance/accounting/taxation/fiscal_year/fiscal_year/fiscal_year02.png
deleted file mode 100644
index 977323dac..000000000
Binary files a/content/applications/finance/accounting/taxation/fiscal_year/fiscal_year/fiscal_year02.png and /dev/null differ
diff --git a/content/applications/finance/accounting/taxation/fiscal_year/fiscal_year/fiscal_year03.png b/content/applications/finance/accounting/taxation/fiscal_year/fiscal_year/fiscal_year03.png
deleted file mode 100644
index 42915917a..000000000
Binary files a/content/applications/finance/accounting/taxation/fiscal_year/fiscal_year/fiscal_year03.png and /dev/null differ
diff --git a/content/applications/finance/accounting/taxation/taxes.rst b/content/applications/finance/accounting/taxation/taxes.rst
deleted file mode 100644
index 465ef2092..000000000
--- a/content/applications/finance/accounting/taxation/taxes.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-:nosearch:
-
-=====
-Taxes
-=====
-
-.. toctree::
-   :titlesonly:
-
-   taxes/taxes
-   taxes/default_taxes
-   taxes/fiscal_positions
-   taxes/eu_distance_selling
-   taxes/avatax
-   taxes/taxcloud
-   taxes/retention
-   taxes/B2B_B2C
-   taxes/cash_basis_taxes
-   taxes/vat_validation
diff --git a/content/applications/finance/accounting/taxation/taxes/default_taxes.rst b/content/applications/finance/accounting/taxation/taxes/default_taxes.rst
deleted file mode 100644
index fc38f58a3..000000000
--- a/content/applications/finance/accounting/taxation/taxes/default_taxes.rst
+++ /dev/null
@@ -1,40 +0,0 @@
-=============
-Default taxes
-=============
-
-**Default Taxes** define which :doc:`taxes <taxes>` are automatically selected when there is no
-other indication about which tax to use. For example, Odoo prefills the **Taxes** field with the
-Default Taxes when you create a new product or add a new line on an invoice.
-
-.. image:: default_taxes/default-taxes-invoice-line.png
-   :align: center
-   :alt: Odoo fills out the Tax field automatically according to the Default Taxes
-
-.. important::
-   :doc:`Fiscal Positions <fiscal_positions>` take the Default Tax into account. Therefore, if a
-   Fiscal Position is applied to an invoice, Odoo applies the related tax instead of the Default
-   Taxes, as mapped in the Fiscal Position.
-
-Configuration
-=============
-
-**Default Taxes** are automatically set up according to the country selected at the creation of your
-database, or when you set up a :ref:`fiscal localization package <fiscal_localizations/packages>`
-for your company.
-
-To change your **Default Taxes**, go to :menuselection:`Accounting --> Configuration --> Settings
---> Taxes --> Default Taxes`, select the appropriate taxes for your default **Sales Tax** and
-**Purchase Tax**, and click on *Save*.
-
-.. image:: default_taxes/default-taxes-configuration.png
-   :align: center
-   :alt: Define which taxes to use by default on Odoo
-
-.. note::
-   Databases with multiple companies: the Default Taxes values are company-specific.
-
-.. seealso::
-
-  - :doc:`taxes`
-  - :doc:`fiscal_positions`
-  - :doc:`../../../fiscal_localizations`
diff --git a/content/applications/finance/accounting/taxation/taxes/taxes.rst b/content/applications/finance/accounting/taxes.rst
similarity index 83%
rename from content/applications/finance/accounting/taxation/taxes/taxes.rst
rename to content/applications/finance/accounting/taxes.rst
index 3cf806755..0eec51467 100644
--- a/content/applications/finance/accounting/taxation/taxes/taxes.rst
+++ b/content/applications/finance/accounting/taxes.rst
@@ -1,3 +1,5 @@
+:show-content:
+
 =====
 Taxes
 =====
@@ -6,6 +8,30 @@ There are numerous types of **taxes**, and their application varies greatly, dep
 your company's localization. To make sure they are recorded with accuracy, Odoo's tax engine
 supports all kinds of uses and computations.
 
+.. _taxes/default:
+
+Default taxes
+=============
+
+**Default Taxes** define which taxes are automatically selected when there is no
+other indication about which tax to use. For example, Odoo prefills the **Taxes** field with the
+Default Taxes when you create a new product or add a new line on an invoice.
+
+.. image:: taxes/default-invoice-line.png
+   :alt: Odoo fills out the Tax field automatically according to the Default Taxes
+
+To change your **Default Taxes**, go to :menuselection:`Accounting --> Configuration --> Settings
+--> Taxes --> Default Taxes`, select the appropriate taxes for your default **Sales Tax** and
+**Purchase Tax**, and click on *Save*.
+
+.. image:: taxes/default-configuration.png
+   :alt: Define which taxes to use by default on Odoo
+
+.. note::
+   **Default Taxes** are automatically set up according to the country selected at the creation of
+   your database, or when you set up a :ref:`fiscal localization package
+   <fiscal_localizations/packages>` for your company.
+
 .. _taxes/list_activation:
 
 Activate Sales Taxes from the List view
@@ -18,8 +44,7 @@ activated by default, so that you can activate only the ones relevant for your b
 To activate Sale Taxes, go to :menuselection:`Accounting --> Configuration --> Taxes` and use the
 *Activate* toggle button to activate or deactivate a tax.
 
-.. image:: taxes/taxes-list.png
-   :align: center
+.. image:: taxes/list.png
    :alt: Activate pre-configured taxes in Odoo Accounting
 
 .. _taxes/configuration:
@@ -30,8 +55,7 @@ Configuration
 To edit or create a **Tax**, go to :menuselection:`Accounting --> Configuration --> Taxes` and open
 a tax or click on *Create*.
 
-.. image:: taxes/taxes-edit.png
-   :align: center
+.. image:: taxes/edit.png
    :alt: Edition of a tax in Odoo Accounting
 
 .. _taxes/labels:
@@ -155,8 +179,7 @@ Definition tab
 Allocate with precision the amount of the taxable basis or percentages of the computed tax to
 multiple accounts and Tax Grids.
 
-.. image:: taxes/taxes-definition.png
-   :align: center
+.. image:: taxes/definition.png
    :alt: Allocate tax amounts to the right accounts and tax grids
 
 - **Based On**:
@@ -165,7 +188,7 @@ multiple accounts and Tax Grids.
   - % of tax: a percentage of the computed tax.
 
 - **Account**: if defined, an additional Journal Item is recorded.
-- **Tax Grids**:  used to generate :doc:`Tax Reports <../../reporting/declarations/tax_returns>`
+- **Tax Grids**:  used to generate :doc:`Tax Reports <reporting/tax_returns>`
   automatically, according to your country's regulations.
 
 .. _taxes/advanced-tab:
@@ -182,8 +205,7 @@ The label of the tax, as displayed on each invoice line in the **Taxes** column.
 :ref:`label <taxes/labels>` visible to *front end* users, on exported invoices, on their Customer
 Portals, etc.
 
-.. image:: taxes/taxes-invoice-label.png
-   :align: center
+.. image:: taxes/invoice-label.png
    :alt: The Label on Invoices is displayed on each invoice line
 
 .. _taxes/tax-group:
@@ -195,10 +217,9 @@ Select to which **Tax Group** the tax belongs. The Tax Group name is the :ref:`l
 <taxes/labels>` displayed above the *Total* line on exported invoices, and the Customer Portals.
 
 Tax groups include different iterations of the same tax. This can be useful when you must record
-differently the same tax according to :doc:`Fiscal Positions <fiscal_positions>`.
+differently the same tax according to :doc:`Fiscal Positions <taxes/fiscal_positions>`.
 
-.. image:: taxes/taxes-invoice-tax-group.png
-   :align: center
+.. image:: taxes/invoice-tax-group.png
    :alt: The Tax Group name is different from the Label on Invoices
 
 In the example above, we see a 0% tax for Intra-Community customers in Europe. It records amounts on
@@ -235,7 +256,7 @@ For example, a product has a Sales Price of $1000, and we apply a *10% of Price*
 
 .. note::
    If you need to define prices accurately, both tax-included and tax-excluded, please refer to the
-   following documentation: :doc:`B2B_B2C`.
+   following documentation: :doc:`taxes/B2B_B2C`.
 
 .. note::
    - **Invoices**: By default, the Line Subtotals displayed on your invoices are *Tax-Excluded*. To
@@ -257,8 +278,7 @@ the same product.
 You can configure a new :ref:`Group of Taxes <taxes/computation>` to include this tax, or add it
 directly to a product line.
 
-.. image:: taxes/taxes-subsequent-line.png
-   :align: center
+.. image:: taxes/subsequent-line.png
    :alt: The eco-tax is taken into the basis of the 21% VAT tax
 
 .. warning::
@@ -269,13 +289,24 @@ directly to a product line.
    To reorder the sequence, go to :menuselection:`Accounting --> Configuration --> Taxes`, and drag
    and drop the lines with the handles next to the tax names.
 
-   .. image:: taxes/taxes-list-sequence.png
-      :align: center
+   .. image:: taxes/list-sequence.png
       :alt: The taxes' sequence in Odoo determines which tax is applied first
 
 .. seealso::
 
-  - :doc:`fiscal_positions`
-  - :doc:`B2B_B2C`
-  - :doc:`taxcloud`
-  - :doc:`../../reporting/declarations/tax_returns`
+  - :doc:`taxes/fiscal_positions`
+  - :doc:`taxes/B2B_B2C`
+  - :doc:`taxes/taxcloud`
+  - :doc:`reporting/tax_returns`
+
+.. toctree::
+   :titlesonly:
+
+   taxes/cash_basis
+   taxes/retention
+   taxes/vat_validation
+   taxes/fiscal_positions
+   taxes/avatax
+   taxes/taxcloud
+   taxes/eu_distance_selling
+   taxes/B2B_B2C
diff --git a/content/applications/finance/accounting/taxation/taxes/B2B_B2C.rst b/content/applications/finance/accounting/taxes/B2B_B2C.rst
similarity index 97%
rename from content/applications/finance/accounting/taxation/taxes/B2B_B2C.rst
rename to content/applications/finance/accounting/taxes/B2B_B2C.rst
index 61cea001f..1dfd01548 100644
--- a/content/applications/finance/accounting/taxation/taxes/B2B_B2C.rst
+++ b/content/applications/finance/accounting/taxes/B2B_B2C.rst
@@ -1,6 +1,6 @@
-===========================================================
-Manage prices for B2B (tax excluded) and B2C (tax included)
-===========================================================
+=================================================
+B2B (tax excluded) and B2C (tax included) pricing
+=================================================
 
 When working with consumers, prices are usually expressed with taxes
 included in the price (e.g., in most eCommerce). But, when you work in a
diff --git a/content/applications/finance/accounting/taxation/taxes/B2B_B2C/price_B2C_B2B01.png b/content/applications/finance/accounting/taxes/B2B_B2C/price_B2C_B2B01.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/B2B_B2C/price_B2C_B2B01.png
rename to content/applications/finance/accounting/taxes/B2B_B2C/price_B2C_B2B01.png
diff --git a/content/applications/finance/accounting/taxation/taxes/B2B_B2C/price_B2C_B2B02.png b/content/applications/finance/accounting/taxes/B2B_B2C/price_B2C_B2B02.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/B2B_B2C/price_B2C_B2B02.png
rename to content/applications/finance/accounting/taxes/B2B_B2C/price_B2C_B2B02.png
diff --git a/content/applications/finance/accounting/taxation/taxes/B2B_B2C/price_B2C_B2B03.png b/content/applications/finance/accounting/taxes/B2B_B2C/price_B2C_B2B03.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/B2B_B2C/price_B2C_B2B03.png
rename to content/applications/finance/accounting/taxes/B2B_B2C/price_B2C_B2B03.png
diff --git a/content/applications/finance/accounting/taxation/taxes/B2B_B2C/price_B2C_B2B04.png b/content/applications/finance/accounting/taxes/B2B_B2C/price_B2C_B2B04.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/B2B_B2C/price_B2C_B2B04.png
rename to content/applications/finance/accounting/taxes/B2B_B2C/price_B2C_B2B04.png
diff --git a/content/applications/finance/accounting/taxation/taxes/B2B_B2C/price_B2C_B2B05.png b/content/applications/finance/accounting/taxes/B2B_B2C/price_B2C_B2B05.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/B2B_B2C/price_B2C_B2B05.png
rename to content/applications/finance/accounting/taxes/B2B_B2C/price_B2C_B2B05.png
diff --git a/content/applications/finance/accounting/taxation/taxes/avatax.rst b/content/applications/finance/accounting/taxes/avatax.rst
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/avatax.rst
rename to content/applications/finance/accounting/taxes/avatax.rst
diff --git a/content/applications/finance/accounting/taxation/taxes/avatax/avatax-category.png b/content/applications/finance/accounting/taxes/avatax/avatax-category.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/avatax/avatax-category.png
rename to content/applications/finance/accounting/taxes/avatax/avatax-category.png
diff --git a/content/applications/finance/accounting/taxation/taxes/avatax/avatax-configuration-settings.png b/content/applications/finance/accounting/taxes/avatax/avatax-configuration-settings.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/avatax/avatax-configuration-settings.png
rename to content/applications/finance/accounting/taxes/avatax/avatax-configuration-settings.png
diff --git a/content/applications/finance/accounting/taxation/taxes/avatax/choose-customer-address.png b/content/applications/finance/accounting/taxes/avatax/choose-customer-address.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/avatax/choose-customer-address.png
rename to content/applications/finance/accounting/taxes/avatax/choose-customer-address.png
diff --git a/content/applications/finance/accounting/taxation/taxes/avatax/override-avatax-product-category.png b/content/applications/finance/accounting/taxes/avatax/override-avatax-product-category.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/avatax/override-avatax-product-category.png
rename to content/applications/finance/accounting/taxes/avatax/override-avatax-product-category.png
diff --git a/content/applications/finance/accounting/taxation/taxes/avatax/validate-customer-address.png b/content/applications/finance/accounting/taxes/avatax/validate-customer-address.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/avatax/validate-customer-address.png
rename to content/applications/finance/accounting/taxes/avatax/validate-customer-address.png
diff --git a/content/applications/finance/accounting/taxation/taxes/cash_basis_taxes.rst b/content/applications/finance/accounting/taxes/cash_basis.rst
similarity index 96%
rename from content/applications/finance/accounting/taxation/taxes/cash_basis_taxes.rst
rename to content/applications/finance/accounting/taxes/cash_basis.rst
index 5d8d982dd..5160201a8 100644
--- a/content/applications/finance/accounting/taxation/taxes/cash_basis_taxes.rst
+++ b/content/applications/finance/accounting/taxes/cash_basis.rst
@@ -20,7 +20,7 @@ Then, define the :guilabel:`Tax Cash Basis Journal`. Click on the external link
 journal to update its default properties such as the :guilabel:`Journal Name`, :guilabel:`Type` or
 :guilabel:`Short Code`.
 
-.. image:: cash_basis_taxes/tax_cash_basis_journal.png
+.. image:: cash_basis/tax_cash_basis_journal.png
     :align: center
     :alt: Select your Tax Cash Basis Journal and click on the external link
 
@@ -35,7 +35,7 @@ clicking on it.
 The :guilabel:`Account` column reflects the proper transitional accounts to post taxes until the
 payment is registered.
 
-.. image:: cash_basis_taxes/account_column.png
+.. image:: cash_basis/account_column.png
     :align: center
     :alt: Fill in the account column with a transitional accounts where taxes go until the payment
        is registered
@@ -45,7 +45,7 @@ In the :guilabel:`Advanced Options` tab, decide of the :guilabel:`Tax Exigilibit
 then also define the :guilabel:`Cash Basis Transition Account` where the tax amount is recorded as
 long as the original invoice has not been reconciled.
 
-.. image:: cash_basis_taxes/advanced_options.png
+.. image:: cash_basis/advanced_options.png
     :align: center
     :alt: Fill in the Cash Basis Transition Account where taxes amounts go until payment
         reconciliation.
@@ -56,7 +56,7 @@ Impact of cash basis taxes on accounting
 To illustrate the impact of cash basis taxes on accounting transactions, let's take an example with
 the sales of a product that costs 1,000$, with a cash basis tax of 15%.
 
-.. image:: cash_basis_taxes/customer_invoice_with_cbt.png
+.. image:: cash_basis/customer_invoice_with_cbt.png
     :align: center
     :alt:
 
diff --git a/content/applications/finance/accounting/taxation/taxes/cash_basis_taxes/account_column.png b/content/applications/finance/accounting/taxes/cash_basis/account_column.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/cash_basis_taxes/account_column.png
rename to content/applications/finance/accounting/taxes/cash_basis/account_column.png
diff --git a/content/applications/finance/accounting/taxation/taxes/cash_basis_taxes/advanced_options.png b/content/applications/finance/accounting/taxes/cash_basis/advanced_options.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/cash_basis_taxes/advanced_options.png
rename to content/applications/finance/accounting/taxes/cash_basis/advanced_options.png
diff --git a/content/applications/finance/accounting/taxation/taxes/cash_basis_taxes/customer_invoice_with_cbt.png b/content/applications/finance/accounting/taxes/cash_basis/customer_invoice_with_cbt.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/cash_basis_taxes/customer_invoice_with_cbt.png
rename to content/applications/finance/accounting/taxes/cash_basis/customer_invoice_with_cbt.png
diff --git a/content/applications/finance/accounting/taxation/taxes/cash_basis_taxes/tax_cash_basis_journal.png b/content/applications/finance/accounting/taxes/cash_basis/tax_cash_basis_journal.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/cash_basis_taxes/tax_cash_basis_journal.png
rename to content/applications/finance/accounting/taxes/cash_basis/tax_cash_basis_journal.png
diff --git a/content/applications/finance/accounting/taxation/taxes/default_taxes/default-taxes-configuration.png b/content/applications/finance/accounting/taxes/default-configuration.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/default_taxes/default-taxes-configuration.png
rename to content/applications/finance/accounting/taxes/default-configuration.png
diff --git a/content/applications/finance/accounting/taxation/taxes/default_taxes/default-taxes-invoice-line.png b/content/applications/finance/accounting/taxes/default-invoice-line.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/default_taxes/default-taxes-invoice-line.png
rename to content/applications/finance/accounting/taxes/default-invoice-line.png
diff --git a/content/applications/finance/accounting/taxation/taxes/taxes/taxes-definition.png b/content/applications/finance/accounting/taxes/definition.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/taxes/taxes-definition.png
rename to content/applications/finance/accounting/taxes/definition.png
diff --git a/content/applications/finance/accounting/taxation/taxes/taxes/taxes-edit.png b/content/applications/finance/accounting/taxes/edit.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/taxes/taxes-edit.png
rename to content/applications/finance/accounting/taxes/edit.png
diff --git a/content/applications/finance/accounting/taxation/taxes/eu_distance_selling.rst b/content/applications/finance/accounting/taxes/eu_distance_selling.rst
similarity index 96%
rename from content/applications/finance/accounting/taxation/taxes/eu_distance_selling.rst
rename to content/applications/finance/accounting/taxes/eu_distance_selling.rst
index b5ccf8689..6596898c0 100644
--- a/content/applications/finance/accounting/taxation/taxes/eu_distance_selling.rst
+++ b/content/applications/finance/accounting/taxes/eu_distance_selling.rst
@@ -10,7 +10,7 @@ which the goods or services are delivered.
 .. note::
    This remains true even if your organization is located outside of the European Union.
 
-While this regulation mainly applies to :doc:`eCommerce <../../../../websites/ecommerce>` sales to
+While this regulation mainly applies to :doc:`eCommerce <../../../websites/ecommerce>` sales to
 private EU consumers, it is also valid for mail order sales and telesales.
 
 The Union **One-Stop Shop (OSS)** is an online portal where businesses can register for the OSS and
@@ -18,7 +18,7 @@ declare their intra-community distance sales. Each EU member state integrates an
 
 The **EU intra-community Distance Selling** feature helps your organization comply with this
 regulation by creating and configuring new :doc:`fiscal positions <fiscal_positions>` and
-:doc:`taxes <taxes>` based on your company's country.
+:doc:`taxes <../taxes>` based on your company's country.
 
 .. seealso::
    - `European Commission: OSS | Taxation and Customs Union
@@ -66,4 +66,4 @@ Distance Selling` and click on the *Refresh tax mapping* button.
 
 .. seealso::
    - :doc:`fiscal_positions`
-   - :doc:`taxes`
+   - :doc:`../taxes`
diff --git a/content/applications/finance/accounting/taxation/taxes/eu_distance_selling/enable-feature.png b/content/applications/finance/accounting/taxes/eu_distance_selling/enable-feature.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/eu_distance_selling/enable-feature.png
rename to content/applications/finance/accounting/taxes/eu_distance_selling/enable-feature.png
diff --git a/content/applications/finance/accounting/taxation/taxes/fiscal_positions.rst b/content/applications/finance/accounting/taxes/fiscal_positions.rst
similarity index 99%
rename from content/applications/finance/accounting/taxation/taxes/fiscal_positions.rst
rename to content/applications/finance/accounting/taxes/fiscal_positions.rst
index cd0765398..dec8ce212 100644
--- a/content/applications/finance/accounting/taxation/taxes/fiscal_positions.rst
+++ b/content/applications/finance/accounting/taxes/fiscal_positions.rst
@@ -106,6 +106,6 @@ To manually select which Fiscal Position to use for a new Sales Order, Invoice,
 
 .. seealso::
 
-  * :doc:`taxes`
+  * :doc:`../taxes`
   * :doc:`taxcloud`
   * :doc:`B2B_B2C`
diff --git a/content/applications/finance/accounting/taxation/taxes/fiscal_positions/fiscal-positions-automatic.png b/content/applications/finance/accounting/taxes/fiscal_positions/fiscal-positions-automatic.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/fiscal_positions/fiscal-positions-automatic.png
rename to content/applications/finance/accounting/taxes/fiscal_positions/fiscal-positions-automatic.png
diff --git a/content/applications/finance/accounting/taxation/taxes/fiscal_positions/fiscal-positions-intra-community.png b/content/applications/finance/accounting/taxes/fiscal_positions/fiscal-positions-intra-community.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/fiscal_positions/fiscal-positions-intra-community.png
rename to content/applications/finance/accounting/taxes/fiscal_positions/fiscal-positions-intra-community.png
diff --git a/content/applications/finance/accounting/taxation/taxes/fiscal_positions/fiscal-positions-partner.png b/content/applications/finance/accounting/taxes/fiscal_positions/fiscal-positions-partner.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/fiscal_positions/fiscal-positions-partner.png
rename to content/applications/finance/accounting/taxes/fiscal_positions/fiscal-positions-partner.png
diff --git a/content/applications/finance/accounting/taxation/taxes/fiscal_positions/fiscal-positions-transaction.png b/content/applications/finance/accounting/taxes/fiscal_positions/fiscal-positions-transaction.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/fiscal_positions/fiscal-positions-transaction.png
rename to content/applications/finance/accounting/taxes/fiscal_positions/fiscal-positions-transaction.png
diff --git a/content/applications/finance/accounting/taxation/taxes/taxes/taxes-invoice-label.png b/content/applications/finance/accounting/taxes/invoice-label.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/taxes/taxes-invoice-label.png
rename to content/applications/finance/accounting/taxes/invoice-label.png
diff --git a/content/applications/finance/accounting/taxation/taxes/taxes/taxes-invoice-tax-group.png b/content/applications/finance/accounting/taxes/invoice-tax-group.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/taxes/taxes-invoice-tax-group.png
rename to content/applications/finance/accounting/taxes/invoice-tax-group.png
diff --git a/content/applications/finance/accounting/taxation/taxes/taxes/taxes-list-sequence.png b/content/applications/finance/accounting/taxes/list-sequence.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/taxes/taxes-list-sequence.png
rename to content/applications/finance/accounting/taxes/list-sequence.png
diff --git a/content/applications/finance/accounting/taxation/taxes/taxes/taxes-list.png b/content/applications/finance/accounting/taxes/list.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/taxes/taxes-list.png
rename to content/applications/finance/accounting/taxes/list.png
diff --git a/content/applications/finance/accounting/taxation/taxes/retention.rst b/content/applications/finance/accounting/taxes/retention.rst
similarity index 95%
rename from content/applications/finance/accounting/taxation/taxes/retention.rst
rename to content/applications/finance/accounting/taxes/retention.rst
index aff03866d..cac486021 100644
--- a/content/applications/finance/accounting/taxation/taxes/retention.rst
+++ b/content/applications/finance/accounting/taxes/retention.rst
@@ -1,6 +1,6 @@
-========================
-Manage withholding taxes
-========================
+=================
+Withholding taxes
+=================
 
 A withholding tax, also called a retention tax, is a government
 requirement for the payer of a customer invoice to withhold or deduct
@@ -67,4 +67,4 @@ The printed invoice will show the different amounts in each tax group.
 
 .. seealso::
 
-  * :doc:`taxes`
+  * :doc:`../taxes`
diff --git a/content/applications/finance/accounting/taxation/taxes/retention/retention01.png b/content/applications/finance/accounting/taxes/retention/retention01.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/retention/retention01.png
rename to content/applications/finance/accounting/taxes/retention/retention01.png
diff --git a/content/applications/finance/accounting/taxation/taxes/retention/retention02.png b/content/applications/finance/accounting/taxes/retention/retention02.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/retention/retention02.png
rename to content/applications/finance/accounting/taxes/retention/retention02.png
diff --git a/content/applications/finance/accounting/taxation/taxes/retention/retention03.png b/content/applications/finance/accounting/taxes/retention/retention03.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/retention/retention03.png
rename to content/applications/finance/accounting/taxes/retention/retention03.png
diff --git a/content/applications/finance/accounting/taxation/taxes/retention/retention04.png b/content/applications/finance/accounting/taxes/retention/retention04.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/retention/retention04.png
rename to content/applications/finance/accounting/taxes/retention/retention04.png
diff --git a/content/applications/finance/accounting/taxation/taxes/taxes/taxes-subsequent-line.png b/content/applications/finance/accounting/taxes/subsequent-line.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/taxes/taxes-subsequent-line.png
rename to content/applications/finance/accounting/taxes/subsequent-line.png
diff --git a/content/applications/finance/accounting/taxation/taxes/taxcloud.rst b/content/applications/finance/accounting/taxes/taxcloud.rst
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/taxcloud.rst
rename to content/applications/finance/accounting/taxes/taxcloud.rst
diff --git a/content/applications/finance/accounting/taxation/taxes/taxcloud/fiscal-position-detect.png b/content/applications/finance/accounting/taxes/taxcloud/fiscal-position-detect.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/taxcloud/fiscal-position-detect.png
rename to content/applications/finance/accounting/taxes/taxcloud/fiscal-position-detect.png
diff --git a/content/applications/finance/accounting/taxation/taxes/taxcloud/tax-payable-id.png b/content/applications/finance/accounting/taxes/taxcloud/tax-payable-id.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/taxcloud/tax-payable-id.png
rename to content/applications/finance/accounting/taxes/taxcloud/tax-payable-id.png
diff --git a/content/applications/finance/accounting/taxation/taxes/taxcloud/taxcloud-api-keys.png b/content/applications/finance/accounting/taxes/taxcloud/taxcloud-api-keys.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/taxcloud/taxcloud-api-keys.png
rename to content/applications/finance/accounting/taxes/taxcloud/taxcloud-api-keys.png
diff --git a/content/applications/finance/accounting/taxation/taxes/taxcloud/taxcloud-settings.png b/content/applications/finance/accounting/taxes/taxcloud/taxcloud-settings.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/taxcloud/taxcloud-settings.png
rename to content/applications/finance/accounting/taxes/taxcloud/taxcloud-settings.png
diff --git a/content/applications/finance/accounting/taxation/taxes/taxcloud/user-defaults-complete-configuration.png b/content/applications/finance/accounting/taxes/taxcloud/user-defaults-complete-configuration.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/taxcloud/user-defaults-complete-configuration.png
rename to content/applications/finance/accounting/taxes/taxcloud/user-defaults-complete-configuration.png
diff --git a/content/applications/finance/accounting/taxation/taxes/taxcloud/user-defaults-search-filters.png b/content/applications/finance/accounting/taxes/taxcloud/user-defaults-search-filters.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/taxcloud/user-defaults-search-filters.png
rename to content/applications/finance/accounting/taxes/taxcloud/user-defaults-search-filters.png
diff --git a/content/applications/finance/accounting/taxation/taxes/taxcloud/user-defaults-search-more.png b/content/applications/finance/accounting/taxes/taxcloud/user-defaults-search-more.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/taxcloud/user-defaults-search-more.png
rename to content/applications/finance/accounting/taxes/taxcloud/user-defaults-search-more.png
diff --git a/content/applications/finance/accounting/taxation/taxes/vat_validation.rst b/content/applications/finance/accounting/taxes/vat_validation.rst
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/vat_validation.rst
rename to content/applications/finance/accounting/taxes/vat_validation.rst
diff --git a/content/applications/finance/accounting/taxation/taxes/vat_validation/vat-validation-configuration.png b/content/applications/finance/accounting/taxes/vat_validation/vat-validation-configuration.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/vat_validation/vat-validation-configuration.png
rename to content/applications/finance/accounting/taxes/vat_validation/vat-validation-configuration.png
diff --git a/content/applications/finance/accounting/taxation/taxes/vat_validation/vat-validation-contact-form.png b/content/applications/finance/accounting/taxes/vat_validation/vat-validation-contact-form.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/vat_validation/vat-validation-contact-form.png
rename to content/applications/finance/accounting/taxes/vat_validation/vat-validation-contact-form.png
diff --git a/content/applications/finance/accounting/taxation/taxes/vat_validation/vat-validation-error.png b/content/applications/finance/accounting/taxes/vat_validation/vat-validation-error.png
similarity index 100%
rename from content/applications/finance/accounting/taxation/taxes/vat_validation/vat-validation-error.png
rename to content/applications/finance/accounting/taxes/vat_validation/vat-validation-error.png
diff --git a/content/applications/finance/accounting/getting_started/process_overview/supplier_bill.rst b/content/applications/finance/accounting/vendor_bills.rst
similarity index 90%
rename from content/applications/finance/accounting/getting_started/process_overview/supplier_bill.rst
rename to content/applications/finance/accounting/vendor_bills.rst
index 00245e5d8..de62fd40a 100644
--- a/content/applications/finance/accounting/getting_started/process_overview/supplier_bill.rst
+++ b/content/applications/finance/accounting/vendor_bills.rst
@@ -1,6 +1,8 @@
-===========================
-From Vendor Bill to Payment
-===========================
+:show-content:
+
+============
+Vendor bills
+============
 
 Once vendor bills are registered in Odoo, you can easily pay vendors for
 the correct amount and at the right time (not too late, not too early;
@@ -21,16 +23,14 @@ When a vendor bill is received, you can record it from :menuselection:`Purchases
 in the Accounting application. As a shortcut,
 you can also use the **New Bill** feature on the accounting dashboard.
 
-.. image:: supplier_bill/vendor_bill05.png
-   :align: center
+.. image:: vendor_bills/vendor_bill05.png
 
 To register a new vendor bill, start by selecting a vendor and inputting
 their invoice as the **Vendor Reference**, then add and confirm the product
 lines, making sure to have the right product quantities, taxes and
 prices.
 
-.. image:: supplier_bill/vendor_bill01.png
-   :align: center
+.. image:: vendor_bills/vendor_bill01.png
 
 Save the invoice to update the pre tax and tax amounts at the bottom of
 the screen. You will most likely need to configure the prices of your
@@ -86,9 +86,7 @@ memo field, we recommend you set the vendor invoice number as a
 reference (Odoo will auto fill this field from the from the vendor bill
 if set it correctly).
 
-.. image:: supplier_bill/vendor_bill06.png
-   :align: center
-
+.. image:: vendor_bills/vendor_bill06.png
 
 .. note::
     You can also register a payment to a vendor directly without applying it to a vendor bill.
@@ -106,8 +104,7 @@ print in checks in batches.
 If you have checks to print, Odoo's accounting dashboard acts as a to do
 list and reminds you of how many checks you have left to be printed.
 
-.. image:: supplier_bill/vendor_bill02.png
-   :align: center
+.. image:: vendor_bills/vendor_bill02.png
 
 By selecting the amount of checks to be printed, you can dive right into
 a list of all payments that are ready to be processed.
@@ -117,8 +114,7 @@ select them all) and set the action to **Print Checks**. Odoo will ask you
 to set the next check number in the sequence and will then print all the
 checks at once.
 
-.. image:: supplier_bill/vendor_bill03.png
-   :align: center
+.. image:: vendor_bills/vendor_bill03.png
 
 Reporting
 =========
@@ -131,8 +127,7 @@ you can use the **Aged Payable** report, under the reporting menu, (in
 :menuselection:`Reporting --> Business Statement --> Aged payable`) to get a visual of all of
 your outstanding bills.
 
-.. image:: supplier_bill/vendor_bill04.png
-   :align: center
+.. image:: vendor_bills/vendor_bill04.png
 
 From here, you can click directly on a vendors name to open up the
 details of all outstanding bills and the amounts due, or you can
@@ -141,4 +136,11 @@ while you're looking through the report, you can print directly to Excel
 or PDF and get exactly what you see on the screen.
 
 .. seealso::
-    * :doc:`customer_invoice`
+    * :doc:`customer_invoices`
+
+.. toctree::
+   :titlesonly:
+
+   vendor_bills/invoice_digitization
+   vendor_bills/assets
+   vendor_bills/deferred_expenses
diff --git a/content/applications/finance/accounting/payables/supplier_bills/assets.rst b/content/applications/finance/accounting/vendor_bills/assets.rst
similarity index 99%
rename from content/applications/finance/accounting/payables/supplier_bills/assets.rst
rename to content/applications/finance/accounting/vendor_bills/assets.rst
index f76425a45..5b112978a 100644
--- a/content/applications/finance/accounting/payables/supplier_bills/assets.rst
+++ b/content/applications/finance/accounting/vendor_bills/assets.rst
@@ -253,4 +253,4 @@ You have three choices for the **Automate Assets** field:
    fully automate its purchase. (see: :ref:`product-assets-account`).
 
 .. seealso::
-  * :doc:`../../getting_started/initial_configuration/chart_of_accounts`
+  * :doc:`../get_started/chart_of_accounts`
diff --git a/content/applications/finance/accounting/payables/supplier_bills/assets/assets01.png b/content/applications/finance/accounting/vendor_bills/assets/assets01.png
similarity index 100%
rename from content/applications/finance/accounting/payables/supplier_bills/assets/assets01.png
rename to content/applications/finance/accounting/vendor_bills/assets/assets01.png
diff --git a/content/applications/finance/accounting/payables/supplier_bills/assets/assets02.png b/content/applications/finance/accounting/vendor_bills/assets/assets02.png
similarity index 100%
rename from content/applications/finance/accounting/payables/supplier_bills/assets/assets02.png
rename to content/applications/finance/accounting/vendor_bills/assets/assets02.png
diff --git a/content/applications/finance/accounting/payables/supplier_bills/assets/assets03.png b/content/applications/finance/accounting/vendor_bills/assets/assets03.png
similarity index 100%
rename from content/applications/finance/accounting/payables/supplier_bills/assets/assets03.png
rename to content/applications/finance/accounting/vendor_bills/assets/assets03.png
diff --git a/content/applications/finance/accounting/payables/supplier_bills/assets/assets04.png b/content/applications/finance/accounting/vendor_bills/assets/assets04.png
similarity index 100%
rename from content/applications/finance/accounting/payables/supplier_bills/assets/assets04.png
rename to content/applications/finance/accounting/vendor_bills/assets/assets04.png
diff --git a/content/applications/finance/accounting/payables/supplier_bills/assets/assets05.png b/content/applications/finance/accounting/vendor_bills/assets/assets05.png
similarity index 100%
rename from content/applications/finance/accounting/payables/supplier_bills/assets/assets05.png
rename to content/applications/finance/accounting/vendor_bills/assets/assets05.png
diff --git a/content/applications/finance/accounting/payables/supplier_bills/assets/assets06.png b/content/applications/finance/accounting/vendor_bills/assets/assets06.png
similarity index 100%
rename from content/applications/finance/accounting/payables/supplier_bills/assets/assets06.png
rename to content/applications/finance/accounting/vendor_bills/assets/assets06.png
diff --git a/content/applications/finance/accounting/payables/supplier_bills/assets/assets07.png b/content/applications/finance/accounting/vendor_bills/assets/assets07.png
similarity index 100%
rename from content/applications/finance/accounting/payables/supplier_bills/assets/assets07.png
rename to content/applications/finance/accounting/vendor_bills/assets/assets07.png
diff --git a/content/applications/finance/accounting/payables/supplier_bills/assets/assets08.png b/content/applications/finance/accounting/vendor_bills/assets/assets08.png
similarity index 100%
rename from content/applications/finance/accounting/payables/supplier_bills/assets/assets08.png
rename to content/applications/finance/accounting/vendor_bills/assets/assets08.png
diff --git a/content/applications/finance/accounting/payables/supplier_bills/assets/assets09.png b/content/applications/finance/accounting/vendor_bills/assets/assets09.png
similarity index 100%
rename from content/applications/finance/accounting/payables/supplier_bills/assets/assets09.png
rename to content/applications/finance/accounting/vendor_bills/assets/assets09.png
diff --git a/content/applications/finance/accounting/payables/supplier_bills/assets/assets10.png b/content/applications/finance/accounting/vendor_bills/assets/assets10.png
similarity index 100%
rename from content/applications/finance/accounting/payables/supplier_bills/assets/assets10.png
rename to content/applications/finance/accounting/vendor_bills/assets/assets10.png
diff --git a/content/applications/finance/accounting/payables/supplier_bills/assets/assets11.png b/content/applications/finance/accounting/vendor_bills/assets/assets11.png
similarity index 100%
rename from content/applications/finance/accounting/payables/supplier_bills/assets/assets11.png
rename to content/applications/finance/accounting/vendor_bills/assets/assets11.png
diff --git a/content/applications/finance/accounting/payables/supplier_bills/deferred_expenses.rst b/content/applications/finance/accounting/vendor_bills/deferred_expenses.rst
similarity index 99%
rename from content/applications/finance/accounting/payables/supplier_bills/deferred_expenses.rst
rename to content/applications/finance/accounting/vendor_bills/deferred_expenses.rst
index 44e317926..e929250ac 100644
--- a/content/applications/finance/accounting/payables/supplier_bills/deferred_expenses.rst
+++ b/content/applications/finance/accounting/vendor_bills/deferred_expenses.rst
@@ -192,4 +192,4 @@ You have three choices for the **Automate Deferred Expense** field:
    products`_).
 
 .. seealso::
-   * :doc:`../../getting_started/initial_configuration/chart_of_accounts`
+   * :doc:`../get_started/chart_of_accounts`
diff --git a/content/applications/finance/accounting/payables/supplier_bills/deferred_expenses/deferred_expenses01.png b/content/applications/finance/accounting/vendor_bills/deferred_expenses/deferred_expenses01.png
similarity index 100%
rename from content/applications/finance/accounting/payables/supplier_bills/deferred_expenses/deferred_expenses01.png
rename to content/applications/finance/accounting/vendor_bills/deferred_expenses/deferred_expenses01.png
diff --git a/content/applications/finance/accounting/payables/supplier_bills/deferred_expenses/deferred_expenses02.png b/content/applications/finance/accounting/vendor_bills/deferred_expenses/deferred_expenses02.png
similarity index 100%
rename from content/applications/finance/accounting/payables/supplier_bills/deferred_expenses/deferred_expenses02.png
rename to content/applications/finance/accounting/vendor_bills/deferred_expenses/deferred_expenses02.png
diff --git a/content/applications/finance/accounting/payables/supplier_bills/deferred_expenses/deferred_expenses03.png b/content/applications/finance/accounting/vendor_bills/deferred_expenses/deferred_expenses03.png
similarity index 100%
rename from content/applications/finance/accounting/payables/supplier_bills/deferred_expenses/deferred_expenses03.png
rename to content/applications/finance/accounting/vendor_bills/deferred_expenses/deferred_expenses03.png
diff --git a/content/applications/finance/accounting/payables/supplier_bills/deferred_expenses/deferred_expenses04.png b/content/applications/finance/accounting/vendor_bills/deferred_expenses/deferred_expenses04.png
similarity index 100%
rename from content/applications/finance/accounting/payables/supplier_bills/deferred_expenses/deferred_expenses04.png
rename to content/applications/finance/accounting/vendor_bills/deferred_expenses/deferred_expenses04.png
diff --git a/content/applications/finance/accounting/payables/supplier_bills/deferred_expenses/deferred_expenses05.png b/content/applications/finance/accounting/vendor_bills/deferred_expenses/deferred_expenses05.png
similarity index 100%
rename from content/applications/finance/accounting/payables/supplier_bills/deferred_expenses/deferred_expenses05.png
rename to content/applications/finance/accounting/vendor_bills/deferred_expenses/deferred_expenses05.png
diff --git a/content/applications/finance/accounting/payables/supplier_bills/deferred_expenses/deferred_expenses06.png b/content/applications/finance/accounting/vendor_bills/deferred_expenses/deferred_expenses06.png
similarity index 100%
rename from content/applications/finance/accounting/payables/supplier_bills/deferred_expenses/deferred_expenses06.png
rename to content/applications/finance/accounting/vendor_bills/deferred_expenses/deferred_expenses06.png
diff --git a/content/applications/finance/accounting/payables/supplier_bills/deferred_expenses/deferred_expenses07.png b/content/applications/finance/accounting/vendor_bills/deferred_expenses/deferred_expenses07.png
similarity index 100%
rename from content/applications/finance/accounting/payables/supplier_bills/deferred_expenses/deferred_expenses07.png
rename to content/applications/finance/accounting/vendor_bills/deferred_expenses/deferred_expenses07.png
diff --git a/content/applications/finance/accounting/payables/supplier_bills/deferred_expenses/deferred_expenses08.png b/content/applications/finance/accounting/vendor_bills/deferred_expenses/deferred_expenses08.png
similarity index 100%
rename from content/applications/finance/accounting/payables/supplier_bills/deferred_expenses/deferred_expenses08.png
rename to content/applications/finance/accounting/vendor_bills/deferred_expenses/deferred_expenses08.png
diff --git a/content/applications/finance/accounting/payables/supplier_bills/deferred_expenses/deferred_expenses09.png b/content/applications/finance/accounting/vendor_bills/deferred_expenses/deferred_expenses09.png
similarity index 100%
rename from content/applications/finance/accounting/payables/supplier_bills/deferred_expenses/deferred_expenses09.png
rename to content/applications/finance/accounting/vendor_bills/deferred_expenses/deferred_expenses09.png
diff --git a/content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst b/content/applications/finance/accounting/vendor_bills/invoice_digitization.rst
similarity index 97%
rename from content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst
rename to content/applications/finance/accounting/vendor_bills/invoice_digitization.rst
index cb5f575be..e553f7eb5 100644
--- a/content/applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst
+++ b/content/applications/finance/accounting/vendor_bills/invoice_digitization.rst
@@ -49,7 +49,7 @@ You can modify the email alias of a journal by going to :menuselection:`Accounti
 --> Journals`, opening the appropriate journal, opening the :guilabel:`Advanced Settings` tab, and
 modifying the :guilabel:`Email Alias` field.
 
-If you use the :doc:`Documents <../../../documents>` app, you can send your scanned invoices to the
+If you use the :doc:`Documents <../../documents>` app, you can send your scanned invoices to the
 :guilabel:`Finance` workspace (e.g., `inbox-financial@example.odoo.com`).
 
 Invoice digitization
diff --git a/content/applications/finance/accounting/getting_started/process_overview/supplier_bill/vendor_bill01.png b/content/applications/finance/accounting/vendor_bills/vendor_bill01.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/process_overview/supplier_bill/vendor_bill01.png
rename to content/applications/finance/accounting/vendor_bills/vendor_bill01.png
diff --git a/content/applications/finance/accounting/getting_started/process_overview/supplier_bill/vendor_bill02.png b/content/applications/finance/accounting/vendor_bills/vendor_bill02.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/process_overview/supplier_bill/vendor_bill02.png
rename to content/applications/finance/accounting/vendor_bills/vendor_bill02.png
diff --git a/content/applications/finance/accounting/getting_started/process_overview/supplier_bill/vendor_bill03.png b/content/applications/finance/accounting/vendor_bills/vendor_bill03.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/process_overview/supplier_bill/vendor_bill03.png
rename to content/applications/finance/accounting/vendor_bills/vendor_bill03.png
diff --git a/content/applications/finance/accounting/getting_started/process_overview/supplier_bill/vendor_bill04.png b/content/applications/finance/accounting/vendor_bills/vendor_bill04.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/process_overview/supplier_bill/vendor_bill04.png
rename to content/applications/finance/accounting/vendor_bills/vendor_bill04.png
diff --git a/content/applications/finance/accounting/getting_started/process_overview/supplier_bill/vendor_bill05.png b/content/applications/finance/accounting/vendor_bills/vendor_bill05.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/process_overview/supplier_bill/vendor_bill05.png
rename to content/applications/finance/accounting/vendor_bills/vendor_bill05.png
diff --git a/content/applications/finance/accounting/getting_started/process_overview/supplier_bill/vendor_bill06.png b/content/applications/finance/accounting/vendor_bills/vendor_bill06.png
similarity index 100%
rename from content/applications/finance/accounting/getting_started/process_overview/supplier_bill/vendor_bill06.png
rename to content/applications/finance/accounting/vendor_bills/vendor_bill06.png
diff --git a/content/applications/finance/expenses.rst b/content/applications/finance/expenses.rst
index 3ec32cca7..12af778f3 100644
--- a/content/applications/finance/expenses.rst
+++ b/content/applications/finance/expenses.rst
@@ -163,8 +163,8 @@ To record the payment or pay by check, click *Register a Payment*.
 
 See how you can easily manage the payment process in Odoo:
 
-* :doc:`accounting/payables/pay/check`
-* :doc:`accounting/payables/pay/sepa`
+* :doc:`accounting/payments/pay_checks`
+* :doc:`accounting/payments/pay_sepa`
 
 
 How to re-invoice expenses to your customers
diff --git a/content/applications/finance/fiscal_localizations.rst b/content/applications/finance/fiscal_localizations.rst
index 629d48b84..333107f22 100644
--- a/content/applications/finance/fiscal_localizations.rst
+++ b/content/applications/finance/fiscal_localizations.rst
@@ -46,8 +46,8 @@ These packages require you to fine-tune your chart of accounts according to your
 taxes you use, and configure your country-specific statements and certifications.
 
 .. seealso::
-   - :doc:`accounting/getting_started/initial_configuration/chart_of_accounts`
-   - :doc:`accounting/taxation/taxes/taxes`
+   - :doc:`accounting/get_started/chart_of_accounts`
+   - :doc:`accounting/taxes`
 
 .. _fiscal_localizations/countries-list:
 
diff --git a/content/applications/finance/fiscal_localizations/egypt.rst b/content/applications/finance/fiscal_localizations/egypt.rst
index f8fe1b54e..17729f203 100644
--- a/content/applications/finance/fiscal_localizations/egypt.rst
+++ b/content/applications/finance/fiscal_localizations/egypt.rst
@@ -122,7 +122,7 @@ Most of these codes are handled automatically by Odoo, provided that your :ref:`
 .. seealso::
    - `Egyptian eInvoicing & eReceipt SDK - Code Tables
      <https://sdk.preprod.invoicing.eta.gov.eg/codes/>`_
-   - :doc:`../accounting/taxation/taxes/taxes`
+   - :doc:`../accounting/taxes`
 
 .. _egypt/e-invoicing-branches:
 
diff --git a/content/applications/finance/fiscal_localizations/italy.rst b/content/applications/finance/fiscal_localizations/italy.rst
index e76020ac8..07b1a796e 100644
--- a/content/applications/finance/fiscal_localizations/italy.rst
+++ b/content/applications/finance/fiscal_localizations/italy.rst
@@ -103,7 +103,7 @@ XML file can be found in the **chatter** of the invoice.
    :alt: Electronic invoicing status (waiting for confirmation)
 
 .. seealso::
-   :doc:`../accounting/receivables/customer_invoices/electronic_invoicing`
+   :doc:`../accounting/customer_invoices/electronic_invoicing`
 
 File processing authorization (Odoo)
 ------------------------------------
diff --git a/content/applications/finance/fiscal_localizations/luxembourg.rst b/content/applications/finance/fiscal_localizations/luxembourg.rst
index 52d045d39..0ad449fea 100644
--- a/content/applications/finance/fiscal_localizations/luxembourg.rst
+++ b/content/applications/finance/fiscal_localizations/luxembourg.rst
@@ -47,7 +47,7 @@ To download it, go to :menuselection:`Accounting --> Report --> Audit Reports --
 click on :guilabel:`Export eCDF declaration`.
 
 .. seealso::
-   - :doc:`../accounting/reporting/declarations/tax_returns`
+   - :doc:`../accounting/reporting/tax_returns`
    - `Platform for electronic gathering of financial data (eCDF) <http://www.ecdf.lu>`_
 
 Annual tax report
diff --git a/content/applications/finance/fiscal_localizations/mexico.rst b/content/applications/finance/fiscal_localizations/mexico.rst
index cdf7eaf96..65b2e66ba 100644
--- a/content/applications/finance/fiscal_localizations/mexico.rst
+++ b/content/applications/finance/fiscal_localizations/mexico.rst
@@ -545,7 +545,7 @@ Once the payment is made, it will be associated with the corresponding invoice a
 be *In Payment* since the payment will be effectively validated when it is bank reconciled.
 
 .. seealso::
-   :doc:`../accounting/bank/reconciliation/use_cases`.
+   :doc:`../accounting/bank/reconciliation`.
 
 .. image:: mexico/mx_ft_18.png
    :align: center
diff --git a/content/applications/finance/fiscal_localizations/peru.rst b/content/applications/finance/fiscal_localizations/peru.rst
index 971f44c86..c9fe55ca8 100644
--- a/content/applications/finance/fiscal_localizations/peru.rst
+++ b/content/applications/finance/fiscal_localizations/peru.rst
@@ -233,7 +233,7 @@ directly to its services and get the currency rate either automatically or manua
    :alt: Bank of Peru is displayed in Multicurrency Service option
 
 Please refer to the next section in our documentation for more information about
-:doc:`multicurrencies <../accounting/others/multi_currency>`.
+:doc:`multicurrencies <../accounting/get_started/multi_currency>`.
 
 Configure Master data
 ---------------------
@@ -354,7 +354,7 @@ EDI Elements
 
 Once you have configured your master data, the invoices can be created from your sales order or
 manually. Additional to the basic invoice information described on :doc:`our page about the
-invoicing process <../accounting/receivables/customer_invoices/overview>`, there are a couple of
+invoicing process <../accounting/customer_invoices/overview>`, there are a couple of
 fields required as part of the Peru EDI:
 
 - **Document type**: The default value is “Factura Electronica” but  you can manually change the
@@ -572,7 +572,7 @@ By default the Credit Note is set in the document type:
    :alt: Credit Note document type
 
 To finish the workflow please follow the instructions on :doc:`our page about Credit Notes
-<../accounting/receivables/customer_invoices/credit_notes>`.
+<../accounting/customer_invoices/credit_notes>`.
 
 .. note::
    The EDI workflow for the Credit notes works in the same way as the invoices.
diff --git a/content/applications/finance/fiscal_localizations/united_arab_emirates.rst b/content/applications/finance/fiscal_localizations/united_arab_emirates.rst
index 85971eacb..2ec613a0e 100644
--- a/content/applications/finance/fiscal_localizations/united_arab_emirates.rst
+++ b/content/applications/finance/fiscal_localizations/united_arab_emirates.rst
@@ -116,7 +116,7 @@ Taxes
 =====
 
 To access your taxes, go to :menuselection:`Accounting --> Configuration --> Taxes`.
-Activate/deactivate, or :doc:`configure </applications/finance/accounting/taxation/taxes/taxes>` the
+Activate/deactivate, or :doc:`configure </applications/finance/accounting/taxes/>` the
 taxes relevant to your business by clicking on them. Remember to only set tax accounts on the **5%**
 tax group, as other groups do not need closing. To do so, enable the :doc:`developer mode
 <../../general/developer_mode>` and go to :menuselection:`Configuration --> Tax Groups`. Then, set a
diff --git a/content/applications/finance/fiscal_localizations/united_kingdom.rst b/content/applications/finance/fiscal_localizations/united_kingdom.rst
index b89f0be72..d3a096d07 100644
--- a/content/applications/finance/fiscal_localizations/united_kingdom.rst
+++ b/content/applications/finance/fiscal_localizations/united_kingdom.rst
@@ -61,7 +61,7 @@ To edit existing taxes or to :guilabel:`Create` a new tax, go to :menuselection:
 Configuration --> Accounting: Taxes`.
 
 .. seealso::
-   - :doc:`taxes <../accounting/taxation/taxes>`
+   - :doc:`taxes <../accounting/taxes>`
    - Tutorial: `Tax report and return
      <https://www.odoo.com/slides/slide/tax-report-and-return-1719?fullscreen=1>`_.
 
diff --git a/content/applications/finance/payment_acquirers.rst b/content/applications/finance/payment_acquirers.rst
index 868fd07c0..3db6154de 100644
--- a/content/applications/finance/payment_acquirers.rst
+++ b/content/applications/finance/payment_acquirers.rst
@@ -122,7 +122,7 @@ Online payment acquirers
 
 .. note::
    Some of these online payment providers can also be added as :doc:`bank accounts
-   <../finance/accounting/bank/setup/bank_accounts>`, but this is **not** the same process as adding
+   <../finance/accounting/bank>`, but this is **not** the same process as adding
    them as payment acquirers. Payment acquirers allow customers to pay online, and bank accounts are
    added and configured on your Accounting app to do a bank reconciliation, which is an accounting
    control process.
@@ -137,7 +137,7 @@ Bank payments
     approve the payment manually once you have received it on your bank account.
 - | SEPA Direct Debit
   | Your customers can sign a SEPA Direct Debit mandate online and get their bank account charged
-    directly. :doc:`Click here <../finance/accounting/receivables/customer_payments/batch_sdd>` for
+    directly. :doc:`Click here <../finance/accounting/payments/batch_sdd>` for
     more information about this payment method.
 
 .. _payment_acquirers/features:
diff --git a/content/applications/general/users/companies.rst b/content/applications/general/users/companies.rst
index 499609c1b..333dae524 100644
--- a/content/applications/general/users/companies.rst
+++ b/content/applications/general/users/companies.rst
@@ -84,11 +84,10 @@ Inter-Company Transactions
 
 First, make sure each one of your companies is properly set in relation to:
 
-- :doc:`Chart of Accounts
-  <../../finance/accounting/getting_started/initial_configuration/chart_of_accounts>`
-- :doc:`Taxes <../../finance/accounting/taxation/taxes/default_taxes>`
-- :doc:`Fiscal Positions <../../finance/accounting/taxation/taxes/fiscal_positions>`
-- :doc:`Journals <../../finance/accounting/bank/setup/bank_accounts>`
+- :doc:`Chart of Accounts <../../finance/accounting/get_started/chart_of_accounts>`
+- :doc:`Taxes <../../finance/accounting/taxes>`
+- :doc:`Fiscal Positions <../../finance/accounting/taxes/fiscal_positions>`
+- :doc:`Journals <../../finance/accounting/bank>`
 - :doc:`Fiscal Localizations <../../finance/fiscal_localizations>`
 - :doc:`Pricelists <../../sales/sales/products_prices/prices/pricing>`
 
@@ -130,4 +129,4 @@ at an invoice/bills level or at a sales/purchase orders level.
 
 .. seealso::
    - :doc:`Multi-company Guidelines </developer/howtos/company>`
-   - :doc:`../../finance/accounting/others/multi_currency`
+   - :doc:`../../finance/accounting/get_started/multi_currency`
diff --git a/content/applications/sales/sales/products_prices.rst b/content/applications/sales/sales/products_prices.rst
index 9fc40a461..921713f0b 100644
--- a/content/applications/sales/sales/products_prices.rst
+++ b/content/applications/sales/sales/products_prices.rst
@@ -8,6 +8,5 @@ Products & Prices
    :titlesonly:
 
    products_prices/products
-   products_prices/taxes
    products_prices/prices
    products_prices/returns.rst
diff --git a/content/applications/sales/sales/products_prices/taxes.rst b/content/applications/sales/sales/products_prices/taxes.rst
deleted file mode 100644
index 2933aff16..000000000
--- a/content/applications/sales/sales/products_prices/taxes.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-:nosearch:
-
-=========
-Set taxes
-=========
-
-.. toctree::
-   :titlesonly:
-
-   /applications/finance/accounting/taxation/taxes/default_taxes
-   /applications/finance/accounting/taxation/taxes/fiscal_positions
-   /applications/finance/accounting/taxation/taxes/taxes
-   /applications/finance/accounting/taxation/taxes/taxcloud
-   /applications/finance/accounting/taxation/taxes/B2B_B2C
diff --git a/content/applications/websites/ecommerce.rst b/content/applications/websites/ecommerce.rst
index efafc8ab0..a56106eae 100644
--- a/content/applications/websites/ecommerce.rst
+++ b/content/applications/websites/ecommerce.rst
@@ -25,6 +25,5 @@ products and increase your average cart sizes.
 
    ecommerce/getting_started
    ecommerce/managing_products
-   ecommerce/taxes
    ecommerce/shopper_experience
    ecommerce/maximizing_revenue
diff --git a/content/applications/websites/ecommerce/getting_started/product_page.rst b/content/applications/websites/ecommerce/getting_started/product_page.rst
index 63ef11c6d..ace0a12b3 100644
--- a/content/applications/websites/ecommerce/getting_started/product_page.rst
+++ b/content/applications/websites/ecommerce/getting_started/product_page.rst
@@ -24,7 +24,6 @@ See how to configure your products from links here below.
 .. seealso::
 
   - :doc:`../managing_products/variants`
-  - :doc:`/applications/sales/sales/products_prices/taxes`
   - :doc:`../maximizing_revenue/cross_selling`
   - :doc:`../maximizing_revenue/reviews`
   - :doc:`../maximizing_revenue/pricing`
diff --git a/content/applications/websites/ecommerce/taxes.rst b/content/applications/websites/ecommerce/taxes.rst
deleted file mode 100644
index d5928eb26..000000000
--- a/content/applications/websites/ecommerce/taxes.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-:nosearch:
-
-=============
-Collect taxes
-=============
-
-.. toctree::
-   :titlesonly:
-
-   ../../finance/accounting/taxation/taxes/default_taxes
-   ../../finance/accounting/taxation/taxes/fiscal_positions
-   ../../finance/accounting/taxation/taxes/taxes
-   ../../finance/accounting/taxation/taxes/taxcloud
diff --git a/content/contributing/documentation/rst_cheat_sheet.rst b/content/contributing/documentation/rst_cheat_sheet.rst
index 7239d0b3d..e26cdcdc0 100644
--- a/content/contributing/documentation/rst_cheat_sheet.rst
+++ b/content/contributing/documentation/rst_cheat_sheet.rst
@@ -1070,7 +1070,7 @@ Document metadata
 | `code-column`   |  | Show a dynamic side column that can be used to display interactive          |
 |                 |    tutorials or code excerpts.                                                 |
 |                 |  | For example, see                                                            |
-|                 |    :doc:`/applications/finance/accounting/getting_started/cheat_sheet`.        |
+|                 |    :doc:`/applications/finance/accounting/get_started/cheat_sheet`.            |
 +-----------------+--------------------------------------------------------------------------------+
 | `hide-page-toc` | Hide the "On this page" sidebar and use full page width for the content.       |
 +-----------------+--------------------------------------------------------------------------------+
diff --git a/content/developer/howtos/accounting_localization.rst b/content/developer/howtos/accounting_localization.rst
index 6667e07ee..83c134f01 100644
--- a/content/developer/howtos/accounting_localization.rst
+++ b/content/developer/howtos/accounting_localization.rst
@@ -120,7 +120,7 @@ Accounts
 
 .. seealso::
    - :ref:`Account References <reference/account_account>`
-   - :doc:`/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts`
+   - :doc:`/applications/finance/accounting/get_started/chart_of_accounts`
 
 Obviously, :guilabel:`Chart of Accounts` cannot exist without :guilabel:`Accounts`. You need to specify them in :file:`data/account.account.template.csv`.
 
@@ -189,7 +189,7 @@ Taxes
 
 .. seealso::
    - :ref:`Tax References <reference/account_tax>`
-   - :doc:`/applications/finance/accounting/taxation/taxes/taxes`
+   - :doc:`/applications/finance/accounting/taxes/`
 
 To add taxes you first need to specify tax groups. You normally need just one tax group for every tax rate, except for the 0% as you need to often distinguish between exempt, 0%, not subject, ... taxes.
 This model only has two required fields: *name* and *country*. Create the file :file:`data/account_tax_group_data.xml` and list the groups:
@@ -249,7 +249,7 @@ The tax report is declared in the :guilabel:`Invoicing` (`account`) app, but the
 
 .. seealso::
    - :ref:`Tax Report Line References <reference/account_tax_report_line>`
-   - :doc:`/applications/finance/accounting/reporting/declarations/tax_returns`
+   - :doc:`/applications/finance/accounting/reporting/tax_returns`
 
 In the previous section, you noticed the fields `invoice_repartition_line_ids` or `refund_repartition_line_ids` and probably understood nothing about them. Good news: you are not alone on this incomprehension. Bad news: you have to figure it out a bit. The topic is complicated. Indeed:
 
@@ -296,7 +296,7 @@ Fiscal positions
 
 .. seealso::
    - :ref:`Fiscal Position References <reference/account_fiscal_position>`
-   - :doc:`/applications/finance/accounting/taxation/taxes/fiscal_positions`
+   - :doc:`/applications/finance/accounting/taxes/fiscal_positions`
 
 Specify fiscal positions in the :file:`data/account_fiscal_position_template_data.xml` file.
 
@@ -343,7 +343,7 @@ Accounting reports
    <div><span class="badge" style="background-color:#AD5E99">Enterprise feature</span><div>
 
 .. seealso::
-  :doc:`/applications/finance/accounting/reporting/overview`
+  :doc:`/applications/finance/accounting/reporting`
 
 Accounting reports should be added via a separate module `l10n_XX_reports` that should go to the `enterprise repository <{GITHUB_ENT_PATH}>`_.
 
@@ -367,7 +367,7 @@ Basic :file:`__manifest__.py` file for such a module looks as following:
     }
 
 
-Functional overview of financial reports is here: :doc:`/applications/finance/accounting/reporting/overview/main_reports`.
+Functional overview of financial reports is here: :doc:`/applications/finance/accounting/reporting`.
 
 Some good examples:
 
diff --git a/redirects/15.0.txt b/redirects/15.0.txt
index 01e8dc601..1c8c26e4a 100644
--- a/redirects/15.0.txt
+++ b/redirects/15.0.txt
@@ -1,9 +1,68 @@
 # applications/finance
 
-applications/finance/accounting/others/multicurrencies/exchange.rst applications/finance/accounting/others/multi_currency.rst                      # /multicurrencies/* -> multi_currency
-applications/finance/accounting/others/multicurrencies/how_it_works.rst applications/finance/accounting/others/multi_currency.rst                  # /multicurrencies/* -> multi_currency
-applications/finance/accounting/others/multicurrencies/invoices_payments.rst applications/finance/accounting/others/multi_currency.rst             # /multicurrencies/* -> multi_currency
-applications/finance/accounting/payables/supplier_bills/ocr.rst applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst    # ocr --> invoice_digitization
+applications/finance/accounting/bank/interbank.rst applications/finance/accounting/payments/internal_transfers.rst                                 # bank/interbank -> payments/internal_transfers
+applications/finance/accounting/bank/reconciliation/cash_transactions.rst applications/finance/accounting/bank/reconciliation_cash.rst             # bank/reconciliation/cash_transactions -> bank/reconciliation_cash
+applications/finance/accounting/bank/reconciliation/reconciliation_models.rst applications/finance/accounting/bank/reconciliation_models.rst       # bank/reconciliation/* -> bank/*
+applications/finance/accounting/bank/reconciliation/use_cases.rst applications/finance/accounting/bank/reconciliation.rst                          # reconciliation/use_cases -> reconciliation
+applications/finance/accounting/bank/setup/bank_accounts.rst applications/finance/accounting/bank.rst                                              # bank/setup/bank_accounts -> bank
+applications/finance/accounting/bank/setup/foreign_currency.rst applications/finance/accounting/bank/foreign_currency.rst                          # bank/setup/* -> bank/*
+applications/finance/accounting/bank/setup/manage_cash_register.rst applications/finance/accounting/bank/cash_register.rst                         # bank/setup/manage_cash_register -> bank/cash_register
+applications/finance/accounting/bank/setup/outstanding_accounts.rst applications/finance/accounting/bank.rst                                       # bank/setup/outstanding_accounts -> bank
+applications/finance/accounting/getting_started/cheat_sheet.rst applications/finance/accounting/get_started/cheat_sheet.rst                        # getting_started/* -> get_started/*
+applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst applications/finance/accounting/get_started/chart_of_accounts.rst     # getting_started/initial_configuration/* -> get_started/*
+applications/finance/accounting/getting_started/initial_configuration/setup.rst applications/finance/accounting/get_started.rst                    # getting_started/initial_configuration/setup -> get_started
+applications/finance/accounting/getting_started/main_concept.rst applications/finance/accounting.rst                                               # accounting/getting_started/main_concept -> accounting
+applications/finance/accounting/getting_started/process_overview/customer_invoice.rst applications/finance/accounting/customer_invoices.rst        # getting_started/process_overview/customer_invoice -> customer_invoices
+applications/finance/accounting/getting_started/process_overview/supplier_bill.rst applications/finance/accounting/vendor_bills.rst                # getting_started/process_overview/supplier_bill -> vendor_bills
+applications/finance/accounting/others/adviser/budget.rst applications/finance/accounting/reporting/budget.rst                                     # others/adviser/* -> reporting/*
+applications/finance/accounting/others/analytic/purchases_expenses.rst applications/finance/accounting/reporting/analytic/purchases_expenses.rst   # others/analytic/* -> reporting/analytic/*
+applications/finance/accounting/others/analytic/timesheets.rst applications/finance/accounting/reporting/analytic/timesheets.rst                   # others/analytic/* -> reporting/analytic/*
+applications/finance/accounting/others/analytic/usage.rst applications/finance/accounting/reporting/analytic.rst                                   # others/analytic/usage -> reporting/analytic
+applications/finance/accounting/others/inventory/avg_price_valuation.rst applications/finance/accounting/get_started/avg_price_valuation.rst       # others/inventory/* -> get_started/*
+applications/finance/accounting/others/multi_currency.rst applications/finance/accounting/get_started/multi_currency.rst                           # others/* -> get_started/*
+applications/finance/accounting/others/multicurrencies/exchange.rst applications/finance/accounting/get_started/multi_currency.rst                 # others/multicurrencies/* -> get_started/multi_currency
+applications/finance/accounting/others/multicurrencies/how_it_works.rst applications/finance/accounting/get_started/multi_currency.rst             # others/multicurrencies/* -> get_started/multi_currency
+applications/finance/accounting/others/multicurrencies/invoices_payments.rst applications/finance/accounting/get_started/multi_currency.rst        # others/multicurrencies/* -> get_started/multi_currency
+applications/finance/accounting/payables/misc/forecast.rst applications/finance/accounting/payments/forecast.rst                                   # payables/misc/* -> payments/*
+applications/finance/accounting/payables/pay/check.rst applications/finance/accounting/payments/pay_checks.rst                                     # payables/pay/check -> payments/pay_checks
+applications/finance/accounting/payables/pay/multiple.rst applications/finance/accounting/payments/multiple.rst                                    # payables/pay/* -> payments/*
+applications/finance/accounting/payables/pay/sepa.rst applications/finance/accounting/payments/pay_sepa.rst                                        # payables/pay/sepa -> payments/pay_sepa
+applications/finance/accounting/payables/supplier_bills/assets.rst applications/finance/accounting/vendor_bills/assets.rst                             # payables/supplier_bills/* -> vendor_bills/*
+applications/finance/accounting/payables/supplier_bills/deferred_expenses.rst applications/finance/accounting/vendor_bills/deferred_expenses.rst       # payables/supplier_bills/* -> vendor_bills/*
+applications/finance/accounting/payables/supplier_bills/invoice_digitization.rst applications/finance/accounting/vendor_bills/invoice_digitization.rst # payables/supplier_bills/* -> vendor_bills/*
+applications/finance/accounting/payables/supplier_bills/ocr.rst applications/finance/accounting/vendor_bills/invoice_digitization.rst                  # payables/supplier_bills/ocr --> vendor_bills/invoice_digitization
+applications/finance/accounting/receivables/customer_invoices/cash_discounts.rst applications/finance/accounting/customer_invoices/cash_discounts.rst             # receivables/customer_invoices/* -> customer_invoices/*
+applications/finance/accounting/receivables/customer_invoices/cash_rounding.rst applications/finance/accounting/customer_invoices/cash_rounding.rst               # receivables/customer_invoices/* -> customer_invoices/*
+applications/finance/accounting/receivables/customer_invoices/credit_notes.rst applications/finance/accounting/customer_invoices/credit_notes.rst                 # receivables/customer_invoices/* -> customer_invoices/*
+applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst applications/finance/accounting/customer_invoices/deferred_revenues.rst       # receivables/customer_invoices/* -> customer_invoices/*
+applications/finance/accounting/receivables/customer_invoices/electronic_invoicing.rst applications/finance/accounting/customer_invoices/electronic_invoicing.rst # receivables/customer_invoices/* -> customer_invoices/*
+applications/finance/accounting/receivables/customer_invoices/epc_qr_code.rst applications/finance/accounting/customer_invoices/epc_qr_code.rst                   # receivables/customer_invoices/* -> customer_invoices/*
+applications/finance/accounting/receivables/customer_invoices/overview.rst applications/finance/accounting/customer_invoices/overview.rst                         # receivables/customer_invoices/* -> customer_invoices/*
+applications/finance/accounting/receivables/customer_invoices/payment_terms.rst applications/finance/accounting/customer_invoices/payment_terms.rst               # receivables/customer_invoices/* -> customer_invoices/*
+applications/finance/accounting/receivables/customer_invoices/snailmail.rst applications/finance/accounting/customer_invoices/snailmail.rst                       # receivables/customer_invoices/* -> customer_invoices/*
+applications/finance/accounting/receivables/customer_payments/batch.rst applications/finance/accounting/payments/batch.rst                         # receivables/customer_payments/* -> payments/*
+applications/finance/accounting/receivables/customer_payments/batch_sdd.rst applications/finance/accounting/payments/batch_sdd.rst                 # receivables/customer_payments/* -> payments/*
+applications/finance/accounting/receivables/customer_payments/check.rst applications/finance/accounting/payments/checks.rst                        # receivables/customer_payments/check -> payments/checks
+applications/finance/accounting/receivables/customer_payments/followup.rst applications/finance/accounting/payments/follow_up.rst                  # receivables/customer_payments/followup -> payments/follow_up
+applications/finance/accounting/receivables/customer_payments/online_payment.rst applications/finance/accounting/payments/online.rst               # receivables/customer_payments/online_payment -> payments/online
+applications/finance/accounting/receivables/customer_payments/recording.rst applications/finance/accounting/payments.rst                           # receivables/customer_payments/recording -> payments
+applications/finance/accounting/reporting/declarations/intrastat.rst applications/finance/accounting/reporting/intrastat.rst                       # reporting/declarations/* -> reporting/*
+applications/finance/accounting/reporting/declarations/tax_returns.rst applications/finance/accounting/reporting/tax_returns.rst                   # reporting/declarations/* -> reporting/*
+applications/finance/accounting/reporting/overview/customize.rst applications/finance/accounting/reporting/customize.rst                           # reporting/overview/* -> reporting/*
+applications/finance/accounting/reporting/overview/data_inalterability.rst applications/finance/accounting/reporting/data_inalterability.rst       # reporting/overview/* -> reporting/*
+applications/finance/accounting/reporting/overview/main_reports.rst applications/finance/accounting/reporting.rst                                  # reporting/overview/main_reports -> reporting
+applications/finance/accounting/taxation/fiscal_year/close_fiscal_year.rst applications/finance/accounting/reporting/year_end.rst                  # taxation/fiscal_year/close_fiscal_year -> reporting/year_end
+applications/finance/accounting/taxation/fiscal_year/fiscal_year.rst applications/finance/accounting/reporting/year_end.rst                        # taxation/fiscal_year/fiscal_year -> reporting/year_end
+applications/finance/accounting/taxation/taxes/avatax.rst applications/finance/accounting/taxes/avatax.rst                                         # taxation/taxes/* -> taxes/*
+applications/finance/accounting/taxation/taxes/B2B_B2C.rst applications/finance/accounting/taxes/B2B_B2C.rst                                       # taxation/taxes/* -> taxes/*
+applications/finance/accounting/taxation/taxes/cash_basis_taxes.rst applications/finance/accounting/taxes/cash_basis.rst                           # taxation/taxes/cash_basis_taxes -> taxes/cash_basis
+applications/finance/accounting/taxation/taxes/default_taxes.rst applications/finance/accounting/taxes.rst                                         # taxation/taxes/default_taxes -> taxes
+applications/finance/accounting/taxation/taxes/eu_distance_selling.rst applications/finance/accounting/taxes/eu_distance_selling.rst               # taxation/taxes/* -> taxes/*
+applications/finance/accounting/taxation/taxes/fiscal_positions.rst applications/finance/accounting/taxes/fiscal_positions.rst                     # taxation/taxes/* -> taxes/*
+applications/finance/accounting/taxation/taxes/retention.rst applications/finance/accounting/taxes/retention.rst                                   # taxation/taxes/* -> taxes/*
+applications/finance/accounting/taxation/taxes/taxcloud.rst applications/finance/accounting/taxes/taxcloud.rst                                     # taxation/taxes/* -> taxes/*
+applications/finance/accounting/taxation/taxes/taxes.rst applications/finance/accounting/taxes.rst                                                 # taxation/taxes/* -> taxes/*
+applications/finance/accounting/taxation/taxes/vat_validation.rst applications/finance/accounting/taxes/vat_validation.rst                         # taxation/taxes/* -> taxes/*
 
 # applications/general