Removed some repeated classes and move others.
Test have errors, waitting for the liabilities group to fix it.