diff --git a/.solcover.js b/.solcover.js
new file mode 100644
index 0000000..2402709
--- /dev/null
+++ b/.solcover.js
@@ -0,0 +1,8 @@
+module.exports = {
+  skipFiles: [
+    "auctions/",
+    "creator-token-standards/",
+    "mocks/",
+    "onft/",
+  ],
+};
\ No newline at end of file
diff --git a/README.md b/README.md
index 1a5548f..68d8ca5 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 [![NPM][npm-shield]][npm-url]
 [![CI][ci-shield]][ci-url]
 [![MIT License][license-shield]][license-url]
+[![Coverage][coverage-shield]][coverage-url]
 
 ERC721M is a EVM minting protocol that enables the multi stage minting, per stage WL management, per stage supply limit, and crossmint support.
 
@@ -115,3 +116,5 @@ MIT © [MagicEden Open Source](https://github.com/magiceden-oss)
 [npm-url]: https://www.npmjs.com/package/@magiceden-oss/erc721m
 [license-shield]: https://img.shields.io/badge/License-MIT-green.svg?style=for-the-badge
 [license-url]: https://github.com/magiceden-oss/erc721m/blob/main/LICENSE.txt
+[coverage-shield]: https://img.shields.io/codecov/c/gh/magicoss/erc721m?style=for-the-badge
+[coverage-url]: https://codecov.io/gh/magicoss/erc721m
diff --git a/contracts/BucketAuction.sol b/contracts/auctions/BucketAuction.sol
similarity index 99%
rename from contracts/BucketAuction.sol
rename to contracts/auctions/BucketAuction.sol
index 1b1d7f8..1729bde 100644
--- a/contracts/BucketAuction.sol
+++ b/contracts/auctions/BucketAuction.sol
@@ -9,7 +9,7 @@ import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 import "erc721a/contracts/ERC721A.sol";
 
 import "./IBucketAuction.sol";
-import "./ERC721M.sol";
+import "../ERC721M.sol";
 
 contract BucketAuction is IBucketAuction, ERC721M {
     using EnumerableSet for EnumerableSet.AddressSet;
diff --git a/contracts/BucketAuctionOperatorFilterer.sol b/contracts/auctions/BucketAuctionOperatorFilterer.sol
similarity index 98%
rename from contracts/BucketAuctionOperatorFilterer.sol
rename to contracts/auctions/BucketAuctionOperatorFilterer.sol
index fa3df3a..ea82aa4 100644
--- a/contracts/BucketAuctionOperatorFilterer.sol
+++ b/contracts/auctions/BucketAuctionOperatorFilterer.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.4;
 
 import "./BucketAuction.sol";
 import {UpdatableOperatorFilterer} from "operator-filter-registry/src/UpdatableOperatorFilterer.sol";
-import {CANONICAL_OPERATOR_FILTER_REGISTRY_ADDRESS, ME_SUBSCRIPTION} from "./utils/Constants.sol";
+import {CANONICAL_OPERATOR_FILTER_REGISTRY_ADDRESS, ME_SUBSCRIPTION} from "../utils/Constants.sol";
 
 contract BucketAuctionOperatorFilterer is
     BucketAuction,
diff --git a/contracts/DutchAuction.sol b/contracts/auctions/DutchAuction.sol
similarity index 99%
rename from contracts/DutchAuction.sol
rename to contracts/auctions/DutchAuction.sol
index 24dd371..79d8638 100644
--- a/contracts/DutchAuction.sol
+++ b/contracts/auctions/DutchAuction.sol
@@ -9,7 +9,7 @@ import "@openzeppelin/contracts/token/common/ERC2981.sol";
 import "erc721a/contracts/ERC721A.sol";
 
 import "./IDutchAuction.sol";
-import "./ERC721M.sol";
+import "../ERC721M.sol";
 
 contract DutchAuction is IDutchAuction, ERC721M {
     bool private immutable _refundable;
diff --git a/contracts/IBucketAuction.sol b/contracts/auctions/IBucketAuction.sol
similarity index 100%
rename from contracts/IBucketAuction.sol
rename to contracts/auctions/IBucketAuction.sol
diff --git a/contracts/IDutchAuction.sol b/contracts/auctions/IDutchAuction.sol
similarity index 100%
rename from contracts/IDutchAuction.sol
rename to contracts/auctions/IDutchAuction.sol
diff --git a/contracts/ERC721MLite.sol b/contracts/onft/ERC721MLite.sol
similarity index 99%
rename from contracts/ERC721MLite.sol
rename to contracts/onft/ERC721MLite.sol
index c186cb2..d9d21b6 100644
--- a/contracts/ERC721MLite.sol
+++ b/contracts/onft/ERC721MLite.sol
@@ -8,9 +8,9 @@ import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import {MerkleProof} from "@openzeppelin/contracts/utils/cryptography/MerkleProof.sol";
 import {SignatureChecker} from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol";
 import {ERC721A, ERC721AQueryable, ERC721A__IERC721Receiver} from "erc721a/contracts/extensions/ERC721AQueryable.sol";
-import {IERC721A, IERC721M} from "./IERC721M.sol";
+import {IERC721A, IERC721M} from "../IERC721M.sol";
 import {UpdatableOperatorFilterer} from "operator-filter-registry/src/UpdatableOperatorFilterer.sol";
-import {CANONICAL_OPERATOR_FILTER_REGISTRY_ADDRESS, ME_SUBSCRIPTION} from "./utils/Constants.sol";
+import {CANONICAL_OPERATOR_FILTER_REGISTRY_ADDRESS, ME_SUBSCRIPTION} from "../utils/Constants.sol";
 
 /**
  * @title ERC721MLite
diff --git a/contracts/ERC721MOnft.sol b/contracts/onft/ERC721MOnft.sol
similarity index 97%
rename from contracts/ERC721MOnft.sol
rename to contracts/onft/ERC721MOnft.sol
index 36b169f..c64c75b 100644
--- a/contracts/ERC721MOnft.sol
+++ b/contracts/onft/ERC721MOnft.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.4;
 
-import {IONFT721Core, ONFT721CoreLite} from "./onft/ONFT721CoreLite.sol";
+import {IONFT721Core, ONFT721CoreLite} from "./ONFT721CoreLite.sol";
 import {ERC721MLite, ERC721A, ERC721A__IERC721Receiver, IERC721A, Ownable} from "./ERC721MLite.sol";
 import {IONFT721} from "@layerzerolabs/solidity-examples/contracts/token/onft/IONFT721.sol";
 
diff --git a/contracts/OperatorFilter/OwnedRegistrant.sol b/contracts/operator-filter/OwnedRegistrant.sol
similarity index 100%
rename from contracts/OperatorFilter/OwnedRegistrant.sol
rename to contracts/operator-filter/OwnedRegistrant.sol