VariableResolver rely now on supplier + reorganize feature files