diff --git a/build/chain.go b/build/chain.go
deleted file mode 100644
index ae00b8e55..000000000
--- a/build/chain.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package build
-
-// Seconds
-const BlockDelay = 3
-
-// Seconds
-const AllowableClockDrift = BlockDelay * 2
diff --git a/build/params.go b/build/params.go
index 1c6146af0..7a5c577ba 100644
--- a/build/params.go
+++ b/build/params.go
@@ -2,31 +2,54 @@ package build
 
 // Core network constants
 
+// /////
+// Storage
+
 const UnixfsChunkSize uint64 = 1 << 20
 const UnixfsLinksPerLevel = 1024
 
 const SectorSize = 16 << 20
 
+// /////
+// Payments
+
 // Blocks
 const PaymentChannelClosingDelay = 6 * 60 * 2 // six hours
 
 // Blocks
 const DealVoucherSkewLimit = 10
 
+// /////
+// Consensus / Network
+
+// Seconds
+const BlockDelay = 3
+
+// Seconds
+const AllowableClockDrift = BlockDelay * 2
+
 // Blocks
 const ForkLengthThreshold = 20
 
+// /////
+// Proofs / Mining
+
 // Blocks
 const RandomnessLookback = 20
 
 // Blocks
 const ProvingPeriodDuration = 10
+
+// Blocks
 const PoSTChallangeTime = 5
 
 const PowerCollateralProportion = 20
 const PerCapitaCollateralProportion = 5
 const CollateralPrecision = 100
 
+// /////
+// Devnet settings
+
 const TotalFilecoin = 2000000000
 const FilecoinPrecision = 1000000000000000000