Revert "Refactoring in IndirectAbsCor"

This reverts commit 08fb6ae608c6681c49709b8c3ade266dd1c7e02d.
Revert "Fixed many warnings in Import and Common"

This reverts commit 749102efe5830e31601d363a5be164ba2c32a92f.