diff --git a/kernel/src/main/scala/cats/kernel/instances/all.scala b/kernel/src/main/scala/cats/kernel/instances/all/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/all.scala
rename to kernel/src/main/scala/cats/kernel/instances/all/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/bigDecimal.scala b/kernel/src/main/scala/cats/kernel/instances/bigDecimal/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/bigDecimal.scala
rename to kernel/src/main/scala/cats/kernel/instances/bigDecimal/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/bigInt.scala b/kernel/src/main/scala/cats/kernel/instances/bigInt/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/bigInt.scala
rename to kernel/src/main/scala/cats/kernel/instances/bigInt/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/bitSet.scala b/kernel/src/main/scala/cats/kernel/instances/bitSet/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/bitSet.scala
rename to kernel/src/main/scala/cats/kernel/instances/bitSet/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/boolean.scala b/kernel/src/main/scala/cats/kernel/instances/boolean/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/boolean.scala
rename to kernel/src/main/scala/cats/kernel/instances/boolean/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/byte.scala b/kernel/src/main/scala/cats/kernel/instances/byte/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/byte.scala
rename to kernel/src/main/scala/cats/kernel/instances/byte/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/char.scala b/kernel/src/main/scala/cats/kernel/instances/char/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/char.scala
rename to kernel/src/main/scala/cats/kernel/instances/char/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/double.scala b/kernel/src/main/scala/cats/kernel/instances/double/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/double.scala
rename to kernel/src/main/scala/cats/kernel/instances/double/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/duration.scala b/kernel/src/main/scala/cats/kernel/instances/duration/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/duration.scala
rename to kernel/src/main/scala/cats/kernel/instances/duration/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/either.scala b/kernel/src/main/scala/cats/kernel/instances/either/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/either.scala
rename to kernel/src/main/scala/cats/kernel/instances/either/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/finiteDuration.scala b/kernel/src/main/scala/cats/kernel/instances/finiteDuration/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/finiteDuration.scala
rename to kernel/src/main/scala/cats/kernel/instances/finiteDuration/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/float.scala b/kernel/src/main/scala/cats/kernel/instances/float/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/float.scala
rename to kernel/src/main/scala/cats/kernel/instances/float/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/function.scala b/kernel/src/main/scala/cats/kernel/instances/function/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/function.scala
rename to kernel/src/main/scala/cats/kernel/instances/function/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/int.scala b/kernel/src/main/scala/cats/kernel/instances/int/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/int.scala
rename to kernel/src/main/scala/cats/kernel/instances/int/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/list.scala b/kernel/src/main/scala/cats/kernel/instances/list/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/list.scala
rename to kernel/src/main/scala/cats/kernel/instances/list/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/long.scala b/kernel/src/main/scala/cats/kernel/instances/long/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/long.scala
rename to kernel/src/main/scala/cats/kernel/instances/long/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/map.scala b/kernel/src/main/scala/cats/kernel/instances/map/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/map.scala
rename to kernel/src/main/scala/cats/kernel/instances/map/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/option.scala b/kernel/src/main/scala/cats/kernel/instances/option/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/option.scala
rename to kernel/src/main/scala/cats/kernel/instances/option/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/queue.scala b/kernel/src/main/scala/cats/kernel/instances/queue/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/queue.scala
rename to kernel/src/main/scala/cats/kernel/instances/queue/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/set.scala b/kernel/src/main/scala/cats/kernel/instances/set/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/set.scala
rename to kernel/src/main/scala/cats/kernel/instances/set/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/short.scala b/kernel/src/main/scala/cats/kernel/instances/short/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/short.scala
rename to kernel/src/main/scala/cats/kernel/instances/short/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/stream.scala b/kernel/src/main/scala/cats/kernel/instances/stream/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/stream.scala
rename to kernel/src/main/scala/cats/kernel/instances/stream/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/string.scala b/kernel/src/main/scala/cats/kernel/instances/string/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/string.scala
rename to kernel/src/main/scala/cats/kernel/instances/string/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/symbol.scala b/kernel/src/main/scala/cats/kernel/instances/symbol/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/symbol.scala
rename to kernel/src/main/scala/cats/kernel/instances/symbol/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/tuple.scala b/kernel/src/main/scala/cats/kernel/instances/tuple/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/tuple.scala
rename to kernel/src/main/scala/cats/kernel/instances/tuple/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/unit.scala b/kernel/src/main/scala/cats/kernel/instances/unit/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/unit.scala
rename to kernel/src/main/scala/cats/kernel/instances/unit/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/uuid.scala b/kernel/src/main/scala/cats/kernel/instances/uuid/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/uuid.scala
rename to kernel/src/main/scala/cats/kernel/instances/uuid/package.scala
diff --git a/kernel/src/main/scala/cats/kernel/instances/vector.scala b/kernel/src/main/scala/cats/kernel/instances/vector/package.scala
similarity index 100%
rename from kernel/src/main/scala/cats/kernel/instances/vector.scala
rename to kernel/src/main/scala/cats/kernel/instances/vector/package.scala