Start of serious reorganization

The whole forwarding logic is (will be) moved to the Forwarding Strategy
class.
37 files changed