diff --git a/packages/network/old_index.d.ts b/packages/network/old_index.d.ts
deleted file mode 100644
index f1f26025a8..0000000000
--- a/packages/network/old_index.d.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * This file is part of the nivo project.
- *
- * Copyright 2016-present, Raphaël Benitte.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-import * as React from 'react'
-import { Dimensions, Box, Theme, MotionProps } from '@nivo/core'
-import { InheritedColorConfig } from '@nivo/colors'
-
-type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>
-
-declare module '@nivo/network' {
-    export interface InputNode {
-        id: string
-        [key: string]: any
-    }
-
-    export interface ComputedNode {
-        id: string
-        x: string
-        y: string
-        radius: string
-        color: string
-        [key: string]: any
-    }
-
-    export interface InputLink {
-        source: string
-        target: string
-        [key: string]: any
-    }
-
-    export interface ComputedLink {
-        id: string
-        source: ComputedNode
-        target: ComputedNode
-        [key: string]: any
-    }
-
-    export type LayerType = 'links' | 'nodes'
-    export interface CustomLayerProps extends Omit<NetworkProps, 'nodes' | 'links'> {
-        nodes: ComputedNode[]
-        links: ComputedLink[]
-    }
-    export type CustomLayer = (props: CustomLayerProps) => React.ReactNode
-    export type Layer = LayerType | CustomLayer
-
-    type NodeAccessor<N, T> = (node: N) => T
-    type LinkAccessor<L, T> = (link: L) => T
-
-    export interface NetworkProps {
-        nodes: InputNode[]
-        links: InputLink[]
-
-        margin?: Box
-
-        linkDistance?: number | LinkAccessor<InputLink, number>
-        repulsivity?: number
-        distanceMin?: number
-        distanceMax?: number
-        iterations?: number
-
-        layers?: Layer[]
-
-        nodeColor: string | NodeAccessor<ComputedNode, string>
-        nodeBorderWidth?: number
-        nodeBorderColor?: InheritedColorConfig<ComputedNode>
-
-        linkThickness?: number | LinkAccessor<ComputedLink, number>
-        linkColor?: InheritedColorConfig<ComputedLink>
-
-        theme?: Theme
-
-        isInteractive?: boolean
-        onClick?: (node: ComputedNode, event: React.MouseEvent<SVGCircleElement>) => void
-    }
-
-    export interface NetworkSvgProps extends NetworkProps, MotionProps {
-        role?: string
-    }
-
-    export class Network extends React.Component<NetworkSvgProps & Dimensions> {}
-    export class ResponsiveNetwork extends React.Component<NetworkSvgProps> {}
-
-    export interface NetworkCanvasProps extends NetworkProps {
-        pixelRatio?: number
-    }
-
-    export class NetworkCanvas extends React.Component<NetworkCanvasProps & Dimensions> {}
-    export class ResponsiveNetworkCanvas extends React.Component<NetworkCanvasProps> {}
-}
diff --git a/packages/network/src/types.ts b/packages/network/src/types.ts
new file mode 100644
index 0000000000..ecd96e355c
--- /dev/null
+++ b/packages/network/src/types.ts
@@ -0,0 +1,86 @@
+import { AriaAttributes, MouseEvent, FunctionComponent } from 'react'
+import { Box, Theme, Dimensions, ModernMotionProps, PropertyAccessor } from '@nivo/core'
+import { InheritedColorConfig } from '@nivo/colors'
+
+export interface InputNode {
+    id: string
+    [key: string]: any
+}
+
+export interface ComputedNode {
+    id: string
+    x: string
+    y: string
+    radius: string
+    color: string
+    [key: string]: any
+}
+
+export interface InputLink {
+    source: string
+    target: string
+    [key: string]: any
+}
+
+export interface ComputedLink {
+    id: string
+    source: ComputedNode
+    target: ComputedNode
+    [key: string]: any
+}
+
+export interface NetworkDataProps {
+    data: {
+        nodes: InputNode[]
+        links: InputLink[]
+    }
+}
+
+export type NetworkLayerId = 'links' | 'nodes'
+export interface NetworkCustomLayerProps {
+    nodes: ComputedNode[]
+    links: ComputedLink[]
+}
+export type NetworkCustomLayer = FunctionComponent<NetworkCustomLayerProps>
+
+export interface NetworkCommonProps {
+    margin: Box
+
+    layers: (NetworkLayerId | NetworkCustomLayer)[]
+
+    linkDistance: number | PropertyAccessor<InputLink, number>
+    repulsivity: number
+    distanceMin: number
+    distanceMax: number
+    iterations: number
+
+    theme: Theme
+
+    nodeColor: string | PropertyAccessor<ComputedNode, string>
+    nodeBorderWidth: number
+    nodeBorderColor: InheritedColorConfig<ComputedNode>
+
+    linkThickness: number | PropertyAccessor<ComputedLink, number>
+    linkColor: InheritedColorConfig<ComputedLink>
+
+    isInteractive: boolean
+    onClick: (node: ComputedNode, event: MouseEvent<SVGCircleElement>) => void
+
+    renderWrapper: boolean
+
+    role: string
+    ariaLabel: AriaAttributes['aria-label']
+    ariaLabelledBy: AriaAttributes['aria-labelledby']
+    ariaDescribedBy: AriaAttributes['aria-describedby']
+}
+
+export type NetworkSvgProps = Partial<NetworkCommonProps> &
+    NetworkDataProps &
+    Dimensions &
+    ModernMotionProps
+
+export type NetworkCanvasProps = Partial<NetworkCommonProps> &
+    NetworkDataProps &
+    Dimensions & {
+        pixelRatio?: number
+    }