diff --git a/LICENCE.Netronome b/LICENCE.Netronome
index c2712e4a..1ed7a7c5 100644
--- a/LICENCE.Netronome
+++ b/LICENCE.Netronome
@@ -1,6 +1,6 @@
 Copyright (c) 2017, NETRONOME Systems, Inc. All rights reserved.
 
-Agilio(r) CoreNIC Firmware License Agreement (the "AGREEMENT")
+Agilio(r) Firmware License Agreement (the "AGREEMENT")
 
 BY INSTALLING OR USING IN ANY MANNER THE SOFTWARE THAT ACCOMPANIES THIS
 AGREEMENT (THE "SOFTWARE") YOU (THE "LICENSEE") ACKNOWLEDGE TO BE BOUND
diff --git a/WHENCE b/WHENCE
index a251cf6c..e9852f6b 100644
--- a/WHENCE
+++ b/WHENCE
@@ -3732,8 +3732,30 @@ File: netronome/nic_AMDA0097-0001_4x10_1x40.nffw
 File: netronome/nic_AMDA0099-0001_2x25.nffw
 File: netronome/nic_AMDA0096-0001_2x10.nffw
 File: netronome/nic_AMDA0097-0001_8x10.nffw
+File: netronome/nic/nic_AMDA0081-0001_1x40.nffw
+File: netronome/nic/nic_AMDA0097-0001_2x40.nffw
+File: netronome/nic/nic_AMDA0099-0001_2x10.nffw
+File: netronome/nic/nic_AMDA0081-0001_4x10.nffw
+File: netronome/nic/nic_AMDA0097-0001_4x10_1x40.nffw
+File: netronome/nic/nic_AMDA0099-0001_2x25.nffw
+File: netronome/nic/nic_AMDA0096-0001_2x10.nffw
+File: netronome/nic/nic_AMDA0097-0001_8x10.nffw
 
-Version: v0.6.1
+Version: v2.0.0
+
+File: netronome/flower/nic_AMDA0099.nffw
+File: netronome/flower/nic_AMDA0096.nffw
+File: netronome/flower/nic_AMDA0097.nffw
+File: netronome/flower/nic_AMDA0081-0001_1x40.nffw
+File: netronome/flower/nic_AMDA0097-0001_2x40.nffw
+File: netronome/flower/nic_AMDA0099-0001_2x10.nffw
+File: netronome/flower/nic_AMDA0081-0001_4x10.nffw
+File: netronome/flower/nic_AMDA0097-0001_4x10_1x40.nffw
+File: netronome/flower/nic_AMDA0099-0001_2x25.nffw
+File: netronome/flower/nic_AMDA0096-0001_2x10.nffw
+File: netronome/flower/nic_AMDA0097-0001_8x10.nffw
+
+Version: r5642
 
 Licence: Redistributable. See LICENCE.Netronome for details
 
diff --git a/netronome/flower/nic_AMDA0081-0001_1x40.nffw b/netronome/flower/nic_AMDA0081-0001_1x40.nffw
new file mode 120000
index 00000000..7850171d
--- /dev/null
+++ b/netronome/flower/nic_AMDA0081-0001_1x40.nffw
@@ -0,0 +1 @@
+nic_AMDA0097.nffw
\ No newline at end of file
diff --git a/netronome/flower/nic_AMDA0081-0001_4x10.nffw b/netronome/flower/nic_AMDA0081-0001_4x10.nffw
new file mode 120000
index 00000000..7850171d
--- /dev/null
+++ b/netronome/flower/nic_AMDA0081-0001_4x10.nffw
@@ -0,0 +1 @@
+nic_AMDA0097.nffw
\ No newline at end of file
diff --git a/netronome/flower/nic_AMDA0096-0001_2x10.nffw b/netronome/flower/nic_AMDA0096-0001_2x10.nffw
new file mode 120000
index 00000000..334d828b
--- /dev/null
+++ b/netronome/flower/nic_AMDA0096-0001_2x10.nffw
@@ -0,0 +1 @@
+nic_AMDA0096.nffw
\ No newline at end of file
diff --git a/netronome/flower/nic_AMDA0096.nffw b/netronome/flower/nic_AMDA0096.nffw
new file mode 100644
index 00000000..43d6dc29
Binary files /dev/null and b/netronome/flower/nic_AMDA0096.nffw differ
diff --git a/netronome/flower/nic_AMDA0097-0001_2x40.nffw b/netronome/flower/nic_AMDA0097-0001_2x40.nffw
new file mode 120000
index 00000000..7850171d
--- /dev/null
+++ b/netronome/flower/nic_AMDA0097-0001_2x40.nffw
@@ -0,0 +1 @@
+nic_AMDA0097.nffw
\ No newline at end of file
diff --git a/netronome/flower/nic_AMDA0097-0001_4x10_1x40.nffw b/netronome/flower/nic_AMDA0097-0001_4x10_1x40.nffw
new file mode 120000
index 00000000..7850171d
--- /dev/null
+++ b/netronome/flower/nic_AMDA0097-0001_4x10_1x40.nffw
@@ -0,0 +1 @@
+nic_AMDA0097.nffw
\ No newline at end of file
diff --git a/netronome/flower/nic_AMDA0097-0001_8x10.nffw b/netronome/flower/nic_AMDA0097-0001_8x10.nffw
new file mode 120000
index 00000000..7850171d
--- /dev/null
+++ b/netronome/flower/nic_AMDA0097-0001_8x10.nffw
@@ -0,0 +1 @@
+nic_AMDA0097.nffw
\ No newline at end of file
diff --git a/netronome/flower/nic_AMDA0097.nffw b/netronome/flower/nic_AMDA0097.nffw
new file mode 100644
index 00000000..9b585b87
Binary files /dev/null and b/netronome/flower/nic_AMDA0097.nffw differ
diff --git a/netronome/flower/nic_AMDA0099-0001_2x10.nffw b/netronome/flower/nic_AMDA0099-0001_2x10.nffw
new file mode 120000
index 00000000..b2cd0803
--- /dev/null
+++ b/netronome/flower/nic_AMDA0099-0001_2x10.nffw
@@ -0,0 +1 @@
+nic_AMDA0099.nffw
\ No newline at end of file
diff --git a/netronome/flower/nic_AMDA0099-0001_2x25.nffw b/netronome/flower/nic_AMDA0099-0001_2x25.nffw
new file mode 120000
index 00000000..b2cd0803
--- /dev/null
+++ b/netronome/flower/nic_AMDA0099-0001_2x25.nffw
@@ -0,0 +1 @@
+nic_AMDA0099.nffw
\ No newline at end of file
diff --git a/netronome/flower/nic_AMDA0099.nffw b/netronome/flower/nic_AMDA0099.nffw
new file mode 100644
index 00000000..fbc52ed0
Binary files /dev/null and b/netronome/flower/nic_AMDA0099.nffw differ
diff --git a/netronome/nic/nic_AMDA0081-0001_1x40.nffw b/netronome/nic/nic_AMDA0081-0001_1x40.nffw
new file mode 100644
index 00000000..138820dc
Binary files /dev/null and b/netronome/nic/nic_AMDA0081-0001_1x40.nffw differ
diff --git a/netronome/nic/nic_AMDA0081-0001_4x10.nffw b/netronome/nic/nic_AMDA0081-0001_4x10.nffw
new file mode 100644
index 00000000..59b3735c
Binary files /dev/null and b/netronome/nic/nic_AMDA0081-0001_4x10.nffw differ
diff --git a/netronome/nic/nic_AMDA0096-0001_2x10.nffw b/netronome/nic/nic_AMDA0096-0001_2x10.nffw
new file mode 100644
index 00000000..6e1a51a8
Binary files /dev/null and b/netronome/nic/nic_AMDA0096-0001_2x10.nffw differ
diff --git a/netronome/nic/nic_AMDA0097-0001_2x40.nffw b/netronome/nic/nic_AMDA0097-0001_2x40.nffw
new file mode 100644
index 00000000..74178cea
Binary files /dev/null and b/netronome/nic/nic_AMDA0097-0001_2x40.nffw differ
diff --git a/netronome/nic/nic_AMDA0097-0001_4x10_1x40.nffw b/netronome/nic/nic_AMDA0097-0001_4x10_1x40.nffw
new file mode 100644
index 00000000..c060415c
Binary files /dev/null and b/netronome/nic/nic_AMDA0097-0001_4x10_1x40.nffw differ
diff --git a/netronome/nic/nic_AMDA0097-0001_8x10.nffw b/netronome/nic/nic_AMDA0097-0001_8x10.nffw
new file mode 100644
index 00000000..d19b564e
Binary files /dev/null and b/netronome/nic/nic_AMDA0097-0001_8x10.nffw differ
diff --git a/netronome/nic/nic_AMDA0099-0001_2x10.nffw b/netronome/nic/nic_AMDA0099-0001_2x10.nffw
new file mode 100644
index 00000000..a83d153b
Binary files /dev/null and b/netronome/nic/nic_AMDA0099-0001_2x10.nffw differ
diff --git a/netronome/nic/nic_AMDA0099-0001_2x25.nffw b/netronome/nic/nic_AMDA0099-0001_2x25.nffw
new file mode 100644
index 00000000..6c3c0736
Binary files /dev/null and b/netronome/nic/nic_AMDA0099-0001_2x25.nffw differ
diff --git a/netronome/nic_AMDA0081-0001_1x40.nffw b/netronome/nic_AMDA0081-0001_1x40.nffw
deleted file mode 100644
index cb70a45d..00000000
Binary files a/netronome/nic_AMDA0081-0001_1x40.nffw and /dev/null differ
diff --git a/netronome/nic_AMDA0081-0001_1x40.nffw b/netronome/nic_AMDA0081-0001_1x40.nffw
new file mode 120000
index 00000000..29f855eb
--- /dev/null
+++ b/netronome/nic_AMDA0081-0001_1x40.nffw
@@ -0,0 +1 @@
+nic/nic_AMDA0081-0001_1x40.nffw
\ No newline at end of file
diff --git a/netronome/nic_AMDA0081-0001_4x10.nffw b/netronome/nic_AMDA0081-0001_4x10.nffw
deleted file mode 100644
index f935d519..00000000
Binary files a/netronome/nic_AMDA0081-0001_4x10.nffw and /dev/null differ
diff --git a/netronome/nic_AMDA0081-0001_4x10.nffw b/netronome/nic_AMDA0081-0001_4x10.nffw
new file mode 120000
index 00000000..aac204c8
--- /dev/null
+++ b/netronome/nic_AMDA0081-0001_4x10.nffw
@@ -0,0 +1 @@
+nic/nic_AMDA0081-0001_4x10.nffw
\ No newline at end of file
diff --git a/netronome/nic_AMDA0096-0001_2x10.nffw b/netronome/nic_AMDA0096-0001_2x10.nffw
deleted file mode 100644
index 8f40cea5..00000000
Binary files a/netronome/nic_AMDA0096-0001_2x10.nffw and /dev/null differ
diff --git a/netronome/nic_AMDA0096-0001_2x10.nffw b/netronome/nic_AMDA0096-0001_2x10.nffw
new file mode 120000
index 00000000..64ace8cd
--- /dev/null
+++ b/netronome/nic_AMDA0096-0001_2x10.nffw
@@ -0,0 +1 @@
+nic/nic_AMDA0096-0001_2x10.nffw
\ No newline at end of file
diff --git a/netronome/nic_AMDA0097-0001_2x40.nffw b/netronome/nic_AMDA0097-0001_2x40.nffw
deleted file mode 100644
index 42b4111a..00000000
Binary files a/netronome/nic_AMDA0097-0001_2x40.nffw and /dev/null differ
diff --git a/netronome/nic_AMDA0097-0001_2x40.nffw b/netronome/nic_AMDA0097-0001_2x40.nffw
new file mode 120000
index 00000000..206a46da
--- /dev/null
+++ b/netronome/nic_AMDA0097-0001_2x40.nffw
@@ -0,0 +1 @@
+nic/nic_AMDA0097-0001_2x40.nffw
\ No newline at end of file
diff --git a/netronome/nic_AMDA0097-0001_4x10_1x40.nffw b/netronome/nic_AMDA0097-0001_4x10_1x40.nffw
deleted file mode 100644
index aeb77a11..00000000
Binary files a/netronome/nic_AMDA0097-0001_4x10_1x40.nffw and /dev/null differ
diff --git a/netronome/nic_AMDA0097-0001_4x10_1x40.nffw b/netronome/nic_AMDA0097-0001_4x10_1x40.nffw
new file mode 120000
index 00000000..29df1eee
--- /dev/null
+++ b/netronome/nic_AMDA0097-0001_4x10_1x40.nffw
@@ -0,0 +1 @@
+nic/nic_AMDA0097-0001_4x10_1x40.nffw
\ No newline at end of file
diff --git a/netronome/nic_AMDA0097-0001_8x10.nffw b/netronome/nic_AMDA0097-0001_8x10.nffw
deleted file mode 100644
index 969bf940..00000000
Binary files a/netronome/nic_AMDA0097-0001_8x10.nffw and /dev/null differ
diff --git a/netronome/nic_AMDA0097-0001_8x10.nffw b/netronome/nic_AMDA0097-0001_8x10.nffw
new file mode 120000
index 00000000..382dcbc1
--- /dev/null
+++ b/netronome/nic_AMDA0097-0001_8x10.nffw
@@ -0,0 +1 @@
+nic/nic_AMDA0097-0001_8x10.nffw
\ No newline at end of file
diff --git a/netronome/nic_AMDA0099-0001_2x10.nffw b/netronome/nic_AMDA0099-0001_2x10.nffw
deleted file mode 100644
index 2cbfc230..00000000
Binary files a/netronome/nic_AMDA0099-0001_2x10.nffw and /dev/null differ
diff --git a/netronome/nic_AMDA0099-0001_2x10.nffw b/netronome/nic_AMDA0099-0001_2x10.nffw
new file mode 120000
index 00000000..cbb4b47f
--- /dev/null
+++ b/netronome/nic_AMDA0099-0001_2x10.nffw
@@ -0,0 +1 @@
+nic/nic_AMDA0099-0001_2x10.nffw
\ No newline at end of file
diff --git a/netronome/nic_AMDA0099-0001_2x25.nffw b/netronome/nic_AMDA0099-0001_2x25.nffw
deleted file mode 100644
index 821e3e98..00000000
Binary files a/netronome/nic_AMDA0099-0001_2x25.nffw and /dev/null differ
diff --git a/netronome/nic_AMDA0099-0001_2x25.nffw b/netronome/nic_AMDA0099-0001_2x25.nffw
new file mode 120000
index 00000000..a1af5a5f
--- /dev/null
+++ b/netronome/nic_AMDA0099-0001_2x25.nffw
@@ -0,0 +1 @@
+nic/nic_AMDA0099-0001_2x25.nffw
\ No newline at end of file