diff --git a/contracts/scripts/deployments/facets/DeployDropFacet.s.sol b/contracts/scripts/deployments/facets/DeployDropFacet.s.sol
index 9766d6716..f2e568bb6 100644
--- a/contracts/scripts/deployments/facets/DeployDropFacet.s.sol
+++ b/contracts/scripts/deployments/facets/DeployDropFacet.s.sol
@@ -8,7 +8,7 @@ pragma solidity ^0.8.23;
 //contracts
 import {Deployer} from "contracts/scripts/common/Deployer.s.sol";
 import {FacetHelper} from "contracts/test/diamond/Facet.t.sol";
-import {DropFacet} from "contracts/src/tokens/drop/DropFacet.sol";
+import {DropFacet} from "contracts/src/airdrop/drop/DropFacet.sol";
 
 contract DeployDropFacet is Deployer, FacetHelper {
   // FacetHelper
diff --git a/contracts/scripts/deployments/facets/DeployRiverPoints.s.sol b/contracts/scripts/deployments/facets/DeployRiverPoints.s.sol
index 7de348375..c033562f5 100644
--- a/contracts/scripts/deployments/facets/DeployRiverPoints.s.sol
+++ b/contracts/scripts/deployments/facets/DeployRiverPoints.s.sol
@@ -8,7 +8,7 @@ pragma solidity ^0.8.23;
 //contracts
 import {Deployer} from "contracts/scripts/common/Deployer.s.sol";
 import {FacetHelper} from "contracts/test/diamond/Facet.t.sol";
-import {RiverPoints} from "contracts/src/tokens/points/RiverPoints.sol";
+import {RiverPoints} from "contracts/src/airdrop/points/RiverPoints.sol";
 
 contract DeployRiverPoints is Deployer, FacetHelper {
   // FacetHelper
diff --git a/contracts/scripts/interactions/InteractClaimCondition.s.sol b/contracts/scripts/interactions/InteractClaimCondition.s.sol
index bc0640b36..0d59b4fd6 100644
--- a/contracts/scripts/interactions/InteractClaimCondition.s.sol
+++ b/contracts/scripts/interactions/InteractClaimCondition.s.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.23;
 
 // interfaces
-import {IDropFacetBase, IDropFacet} from "contracts/src/tokens/drop/IDropFacet.sol";
+import {IDropFacetBase, IDropFacet} from "contracts/src/airdrop/drop/IDropFacet.sol";
 
 // libraries
 import {MerkleTree} from "contracts/test/utils/MerkleTree.sol";
diff --git a/contracts/src/tokens/drop/DropFacet.sol b/contracts/src/airdrop/drop/DropFacet.sol
similarity index 95%
rename from contracts/src/tokens/drop/DropFacet.sol
rename to contracts/src/airdrop/drop/DropFacet.sol
index 0136994da..db9ffe211 100644
--- a/contracts/src/tokens/drop/DropFacet.sol
+++ b/contracts/src/airdrop/drop/DropFacet.sol
@@ -2,18 +2,18 @@
 pragma solidity ^0.8.23;
 
 // interfaces
-import {IDropFacet} from "contracts/src/tokens/drop/IDropFacet.sol";
+import {IDropFacet} from "contracts/src/airdrop/drop/IDropFacet.sol";
 import {IRewardsDistribution} from "contracts/src/base/registry/facets/distribution/v2/IRewardsDistribution.sol";
 
 // libraries
-import {DropStorage} from "contracts/src/tokens/drop/DropStorage.sol";
+import {DropStorage} from "contracts/src/airdrop/drop/DropStorage.sol";
 import {CurrencyTransfer} from "contracts/src/utils/libraries/CurrencyTransfer.sol";
 
 import {SafeCastLib} from "solady/utils/SafeCastLib.sol";
 
 // contracts
 import {Facet} from "@river-build/diamond/src/facets/Facet.sol";
-import {DropFacetBase} from "contracts/src/tokens/drop/DropFacetBase.sol";
+import {DropFacetBase} from "contracts/src/airdrop/drop/DropFacetBase.sol";
 import {OwnableBase} from "@river-build/diamond/src/facets/ownable/OwnableBase.sol";
 
 contract DropFacet is IDropFacet, DropFacetBase, OwnableBase, Facet {
diff --git a/contracts/src/tokens/drop/DropFacetBase.sol b/contracts/src/airdrop/drop/DropFacetBase.sol
similarity index 100%
rename from contracts/src/tokens/drop/DropFacetBase.sol
rename to contracts/src/airdrop/drop/DropFacetBase.sol
diff --git a/contracts/src/tokens/drop/DropStorage.sol b/contracts/src/airdrop/drop/DropStorage.sol
similarity index 100%
rename from contracts/src/tokens/drop/DropStorage.sol
rename to contracts/src/airdrop/drop/DropStorage.sol
diff --git a/contracts/src/tokens/drop/IDropFacet.sol b/contracts/src/airdrop/drop/IDropFacet.sol
similarity index 100%
rename from contracts/src/tokens/drop/IDropFacet.sol
rename to contracts/src/airdrop/drop/IDropFacet.sol
diff --git a/contracts/src/tokens/points/CheckIn.sol b/contracts/src/airdrop/points/CheckIn.sol
similarity index 100%
rename from contracts/src/tokens/points/CheckIn.sol
rename to contracts/src/airdrop/points/CheckIn.sol
diff --git a/contracts/src/tokens/points/IRiverPoints.sol b/contracts/src/airdrop/points/IRiverPoints.sol
similarity index 100%
rename from contracts/src/tokens/points/IRiverPoints.sol
rename to contracts/src/airdrop/points/IRiverPoints.sol
diff --git a/contracts/src/tokens/points/RiverPoints.sol b/contracts/src/airdrop/points/RiverPoints.sol
similarity index 100%
rename from contracts/src/tokens/points/RiverPoints.sol
rename to contracts/src/airdrop/points/RiverPoints.sol
diff --git a/contracts/src/tokens/points/RiverPointsStorage.sol b/contracts/src/airdrop/points/RiverPointsStorage.sol
similarity index 100%
rename from contracts/src/tokens/points/RiverPointsStorage.sol
rename to contracts/src/airdrop/points/RiverPointsStorage.sol
diff --git a/contracts/src/spaces/facets/membership/join/MembershipJoin.sol b/contracts/src/spaces/facets/membership/join/MembershipJoin.sol
index a73fb5647..f84ec3160 100644
--- a/contracts/src/spaces/facets/membership/join/MembershipJoin.sol
+++ b/contracts/src/spaces/facets/membership/join/MembershipJoin.sol
@@ -8,7 +8,7 @@ import {IImplementationRegistry} from "contracts/src/factory/facets/registry/IIm
 import {IRolesBase} from "contracts/src/spaces/facets/roles/IRoles.sol";
 import {IRuleEntitlement} from "contracts/src/spaces/entitlements/rule/IRuleEntitlement.sol";
 import {IMembership} from "contracts/src/spaces/facets/membership/IMembership.sol";
-import {IRiverPointsBase} from "contracts/src/tokens/points/IRiverPoints.sol";
+import {IRiverPointsBase} from "contracts/src/airdrop/points/IRiverPoints.sol";
 
 // libraries
 import {Permissions} from "contracts/src/spaces/facets/Permissions.sol";
@@ -24,7 +24,7 @@ import {Entitled} from "contracts/src/spaces/facets/Entitled.sol";
 import {PrepayBase} from "contracts/src/spaces/facets/prepay/PrepayBase.sol";
 import {ReferralsBase} from "contracts/src/spaces/facets/referrals/ReferralsBase.sol";
 import {EntitlementGatedBase} from "contracts/src/spaces/facets/gated/EntitlementGatedBase.sol";
-import {RiverPoints} from "contracts/src/tokens/points/RiverPoints.sol";
+import {RiverPoints} from "contracts/src/airdrop/points/RiverPoints.sol";
 
 /// @title MembershipJoin
 /// @notice Handles the logic for joining a space, including entitlement checks and payment processing
diff --git a/contracts/test/airdrop/DropFacet.t.sol b/contracts/test/airdrop/DropFacet.t.sol
index 1b7f2c958..9420dd5ba 100644
--- a/contracts/test/airdrop/DropFacet.t.sol
+++ b/contracts/test/airdrop/DropFacet.t.sol
@@ -6,17 +6,17 @@ import {Vm} from "forge-std/Test.sol";
 
 //interfaces
 
-import {IDropFacetBase} from "contracts/src/tokens/drop/IDropFacet.sol";
+import {IDropFacetBase} from "contracts/src/airdrop/drop/IDropFacet.sol";
 import {IOwnableBase} from "@river-build/diamond/src/facets/ownable/IERC173.sol";
 import {IRewardsDistributionBase} from "contracts/src/base/registry/facets/distribution/v2/IRewardsDistribution.sol";
 
 //libraries
 import {FixedPointMathLib} from "solady/utils/FixedPointMathLib.sol";
 import {MerkleTree} from "contracts/test/utils/MerkleTree.sol";
-import {DropFacet} from "contracts/src/tokens/drop/DropFacet.sol";
+import {DropFacet} from "contracts/src/airdrop/drop/DropFacet.sol";
 import {RewardsDistribution} from "contracts/src/base/registry/facets/distribution/v2/RewardsDistribution.sol";
 import {BasisPoints} from "contracts/src/utils/libraries/BasisPoints.sol";
-import {DropStorage} from "contracts/src/tokens/drop/DropStorage.sol";
+import {DropStorage} from "contracts/src/airdrop/drop/DropStorage.sol";
 import {EIP712Utils} from "contracts/test/utils/EIP712Utils.sol";
 import {NodeOperatorStatus} from "contracts/src/base/registry/facets/operator/NodeOperatorStorage.sol";
 
diff --git a/contracts/test/airdrop/RiverPoints.t.sol b/contracts/test/airdrop/RiverPoints.t.sol
index 03d2df33f..c0757d30d 100644
--- a/contracts/test/airdrop/RiverPoints.t.sol
+++ b/contracts/test/airdrop/RiverPoints.t.sol
@@ -6,14 +6,14 @@ pragma solidity ^0.8.19;
 //interfaces
 import {IDiamond} from "@river-build/diamond/src/Diamond.sol";
 import {IOwnableBase} from "@river-build/diamond/src/facets/ownable/IERC173.sol";
-import {IRiverPointsBase} from "contracts/src/tokens/points/IRiverPoints.sol";
+import {IRiverPointsBase} from "contracts/src/airdrop/points/IRiverPoints.sol";
 
 //libraries
-import {CheckIn} from "contracts/src/tokens/points/CheckIn.sol";
+import {CheckIn} from "contracts/src/airdrop/points/CheckIn.sol";
 
 // contracts
 import {River} from "contracts/src/tokens/river/base/River.sol";
-import {RiverPoints} from "contracts/src/tokens/points/RiverPoints.sol";
+import {RiverPoints} from "contracts/src/airdrop/points/RiverPoints.sol";
 import {BaseRegistryTest} from "../base/registry/BaseRegistry.t.sol";
 
 contract RiverPointsTest is