fix: requested changes

src/contracts/misc/GhoAaveSteward.sol

@@ -8,9 +8,7 @@ import {IPoolAddressesProvider} from '@aave/core-v3/contracts/interfaces/IPoolAd
 import {IPool} from '@aave/core-v3/contracts/interfaces/IPool.sol';
 import {DataTypes} from '@aave/core-v3/contracts/protocol/libraries/types/DataTypes.sol';
 import {ReserveConfiguration} from '@aave/core-v3/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
-import {IPoolConfigurator} from './deps/IPoolConfigurator.sol';
-import {IDefaultInterestRateStrategyV2} from './deps/Dependencies.sol';
-import {DefaultReserveInterestRateStrategyV2} from './deps/Dependencies.sol';
+import {IPoolConfigurator, IDefaultInterestRateStrategyV2, DefaultReserveInterestRateStrategyV2} from './dependencies/AaveV3-1.sol';
 import {IGhoAaveSteward} from './interfaces/IGhoAaveSteward.sol';
 import {RiskCouncilControlled} from './RiskCouncilControlled.sol';
 

src/contracts/misc/GhoCcipSteward.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.10;
 
-import {IUpgradeableLockReleaseTokenPool} from './deps/IUpgradeableLockReleaseTokenPool.sol';
-import {RateLimiter} from './deps/RateLimiter.sol';
+import {IUpgradeableLockReleaseTokenPool} from './dependencies/Ccip.sol';
+import {RateLimiter} from './dependencies/Ccip.sol';
 import {IGhoCcipSteward} from './interfaces/IGhoCcipSteward.sol';
 import {RiskCouncilControlled} from './RiskCouncilControlled.sol';
 

src/contracts/misc/GhoGsmSteward.sol

@@ -72,20 +72,20 @@ contract GhoGsmSteward is RiskCouncilControlled, IGhoGsmSteward {
     uint256 sellFee
   ) external onlyRiskCouncil notTimelocked(_gsmTimelocksByAddress[gsm].gsmFeeStrategyLastUpdated) {
     address currentFeeStrategy = IGsm(gsm).getFeeStrategy();
+    require(currentFeeStrategy != address(0), 'FIXED_FEE_STRATEGY_NOT_FOUND');
 
-    if (currentFeeStrategy != address(0)) {
-      uint256 currentBuyFee = IGsmFeeStrategy(currentFeeStrategy).getBuyFee(1e4);
-      uint256 currentSellFee = IGsmFeeStrategy(currentFeeStrategy).getSellFee(1e4);
-      require(buyFee != currentBuyFee || sellFee != currentSellFee, 'NO_CHANGE_IN_FEES');
-      require(
-        _isDifferenceLowerThanMax(currentBuyFee, buyFee, GSM_FEE_RATE_CHANGE_MAX),
-        'INVALID_BUY_FEE_UPDATE'
-      );
-      require(
-        _isDifferenceLowerThanMax(currentSellFee, sellFee, GSM_FEE_RATE_CHANGE_MAX),
-        'INVALID_SELL_FEE_UPDATE'
-      );
-    }
+    uint256 currentBuyFee = IGsmFeeStrategy(currentFeeStrategy).getBuyFee(1e4);
+    uint256 currentSellFee = IGsmFeeStrategy(currentFeeStrategy).getSellFee(1e4);
+    require(currentBuyFee != 0 || currentSellFee != 0, 'CANNOT_UPDATE_ZERO_FEES');
+    require(buyFee != currentBuyFee || sellFee != currentSellFee, 'NO_CHANGE_IN_FEES');
+    require(
+      _isDifferenceLowerThanMax(currentBuyFee, buyFee, GSM_FEE_RATE_CHANGE_MAX),
+      'INVALID_BUY_FEE_UPDATE'
+    );
+    require(
+      _isDifferenceLowerThanMax(currentSellFee, sellFee, GSM_FEE_RATE_CHANGE_MAX),
+      'INVALID_SELL_FEE_UPDATE'
+    );
 
     IFixedFeeStrategyFactory strategyFactory = IFixedFeeStrategyFactory(FIXED_FEE_STRATEGY_FACTORY);
     uint256[] memory buyFeeList = new uint256[](1);