Revert "Major refactoring of Typing, still on going"

This reverts commit 08219ec17a18d69df45c4040f32c1678e4521884.