Clean and upgrade to new syntax
Some reorganization
Reorganizing and fix testes
Working on indirect taxation surve