Strategy support implemented, some folder refactor
Issue Number:

Description:
    New features:

Benchmarks:
    Developed with the following benchmarks:

Todo: