diff --git a/rtl/axis_arb_mux_wrap.py b/rtl/axis_arb_mux_wrap.py
new file mode 100755
index 000000000..292dcc326
--- /dev/null
+++ b/rtl/axis_arb_mux_wrap.py
@@ -0,0 +1,171 @@
+#!/usr/bin/env python
+"""
+Generates an AXI Stream arbitrated mux wrapper with the specified number of ports
+"""
+
+from __future__ import print_function
+
+import argparse
+import math
+from jinja2 import Template
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__.strip())
+    parser.add_argument('-p', '--ports',  type=int, default=4, help="number of ports")
+    parser.add_argument('-n', '--name',   type=str, help="module name")
+    parser.add_argument('-o', '--output', type=str, help="output file name")
+
+    args = parser.parse_args()
+
+    try:
+        generate(**args.__dict__)
+    except IOError as ex:
+        print(ex)
+        exit(1)
+
+def generate(ports=4, name=None, output=None):
+    n = ports
+
+    if name is None:
+        name = "axis_arb_mux_wrap_{0}".format(n)
+
+    if output is None:
+        output = name + ".v"
+
+    print("Opening file '{0}'...".format(output))
+
+    output_file = open(output, 'w')
+
+    print("Generating {0} port AXI stream arbitrated mux wrapper {1}...".format(n, name))
+
+    cn = int(math.ceil(math.log(n, 2)))
+
+    t = Template(u"""/*
+
+Copyright (c) 2018 Alex Forencich
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+*/
+
+// Language: Verilog 2001
+
+`timescale 1ns / 1ps
+
+/*
+ * AXI4-Stream {{n}} port arbitrated mux (wrapper)
+ */
+module {{name}} #
+(
+    parameter DATA_WIDTH = 8,
+    parameter KEEP_ENABLE = (DATA_WIDTH>8),
+    parameter KEEP_WIDTH = (DATA_WIDTH/8),
+    parameter ID_ENABLE = 0,
+    parameter ID_WIDTH = 8,
+    parameter DEST_ENABLE = 0,
+    parameter DEST_WIDTH = 8,
+    parameter USER_ENABLE = 1,
+    parameter USER_WIDTH = 1,
+    // arbitration type: "PRIORITY" or "ROUND_ROBIN"
+    parameter ARB_TYPE = "PRIORITY",
+    // LSB priority: "LOW", "HIGH"
+    parameter LSB_PRIORITY = "HIGH"
+)
+(
+    input  wire                  clk,
+    input  wire                  rst,
+
+    /*
+     * AXI Stream inputs
+     */
+{%- for p in range(n) %}
+    input  wire [DATA_WIDTH-1:0] s{{'%02d'%p}}_axis_tdata,
+    input  wire [KEEP_WIDTH-1:0] s{{'%02d'%p}}_axis_tkeep,
+    input  wire                  s{{'%02d'%p}}_axis_tvalid,
+    output wire                  s{{'%02d'%p}}_axis_tready,
+    input  wire                  s{{'%02d'%p}}_axis_tlast,
+    input  wire [ID_WIDTH-1:0]   s{{'%02d'%p}}_axis_tid,
+    input  wire [DEST_WIDTH-1:0] s{{'%02d'%p}}_axis_tdest,
+    input  wire [USER_WIDTH-1:0] s{{'%02d'%p}}_axis_tuser,
+{% endfor %}
+    /*
+     * AXI Stream output
+     */
+    output wire [DATA_WIDTH-1:0] m_axis_tdata,
+    output wire [KEEP_WIDTH-1:0] m_axis_tkeep,
+    output wire                  m_axis_tvalid,
+    input  wire                  m_axis_tready,
+    output wire                  m_axis_tlast,
+    output wire [ID_WIDTH-1:0]   m_axis_tid,
+    output wire [DEST_WIDTH-1:0] m_axis_tdest,
+    output wire [USER_WIDTH-1:0] m_axis_tuser
+);
+
+axis_arb_mux #(
+    .S_COUNT({{n}}),
+    .DATA_WIDTH(DATA_WIDTH),
+    .KEEP_ENABLE(KEEP_ENABLE),
+    .KEEP_WIDTH(KEEP_WIDTH),
+    .ID_ENABLE(ID_ENABLE),
+    .ID_WIDTH(ID_WIDTH),
+    .DEST_ENABLE(DEST_ENABLE),
+    .DEST_WIDTH(DEST_WIDTH),
+    .USER_ENABLE(USER_ENABLE),
+    .USER_WIDTH(USER_WIDTH),
+    .ARB_TYPE(ARB_TYPE),
+    .LSB_PRIORITY(LSB_PRIORITY)
+)
+axis_arb_mux_inst (
+    .clk(clk),
+    .rst(rst),
+    // AXI inputs
+    .s_axis_tdata({ {% for p in range(n-1,-1,-1) %}s{{'%02d'%p}}_axis_tdata{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tkeep({ {% for p in range(n-1,-1,-1) %}s{{'%02d'%p}}_axis_tkeep{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tvalid({ {% for p in range(n-1,-1,-1) %}s{{'%02d'%p}}_axis_tvalid{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tready({ {% for p in range(n-1,-1,-1) %}s{{'%02d'%p}}_axis_tready{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tlast({ {% for p in range(n-1,-1,-1) %}s{{'%02d'%p}}_axis_tlast{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tid({ {% for p in range(n-1,-1,-1) %}s{{'%02d'%p}}_axis_tid{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tdest({ {% for p in range(n-1,-1,-1) %}s{{'%02d'%p}}_axis_tdest{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tuser({ {% for p in range(n-1,-1,-1) %}s{{'%02d'%p}}_axis_tuser{% if not loop.last %}, {% endif %}{% endfor %} }),
+    // AXI output
+    .m_axis_tdata(m_axis_tdata),
+    .m_axis_tkeep(m_axis_tkeep),
+    .m_axis_tvalid(m_axis_tvalid),
+    .m_axis_tready(m_axis_tready),
+    .m_axis_tlast(m_axis_tlast),
+    .m_axis_tid(m_axis_tid),
+    .m_axis_tdest(m_axis_tdest),
+    .m_axis_tuser(m_axis_tuser)
+);
+
+endmodule
+
+""")
+
+    output_file.write(t.render(
+        n=n,
+        cn=cn,
+        name=name
+    ))
+
+    print("Done")
+
+if __name__ == "__main__":
+    main()
+
diff --git a/rtl/axis_crosspoint_wrap.py b/rtl/axis_crosspoint_wrap.py
new file mode 100755
index 000000000..7f2dcba99
--- /dev/null
+++ b/rtl/axis_crosspoint_wrap.py
@@ -0,0 +1,172 @@
+#!/usr/bin/env python
+"""
+Generates an AXI Stream crosspoint wrapper with the specified number of ports
+"""
+
+from __future__ import print_function
+
+import argparse
+import math
+from jinja2 import Template
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__.strip())
+    parser.add_argument('-p', '--ports',  type=int, default=[4], nargs='+', help="number of ports")
+    parser.add_argument('-n', '--name',   type=str, help="module name")
+    parser.add_argument('-o', '--output', type=str, help="output file name")
+
+    args = parser.parse_args()
+
+    try:
+        generate(**args.__dict__)
+    except IOError as ex:
+        print(ex)
+        exit(1)
+
+def generate(ports=4, name=None, output=None):
+    if type(ports) is int:
+        m = n = ports
+    elif len(ports) == 1:
+        m = n = ports[0]
+    else:
+        m, n = ports
+
+    if name is None:
+        name = "axis_crosspoint_wrap_{0}x{1}".format(m, n)
+
+    if output is None:
+        output = name + ".v"
+
+    print("Opening file '{0}'...".format(output))
+
+    output_file = open(output, 'w')
+
+    print("Generating {0}x{1} port AXI stream crosspoint wrapper {2}...".format(m, n, name))
+
+    cm = int(math.ceil(math.log(m, 2)))
+    cn = int(math.ceil(math.log(n, 2)))
+
+    t = Template(u"""/*
+
+Copyright (c) 2018 Alex Forencich
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+*/
+
+// Language: Verilog 2001
+
+`timescale 1ns / 1ps
+
+/*
+ * AXI4-Stream {{m}}x{{n}} crosspoint (wrapper)
+ */
+module {{name}} #
+(
+    parameter DATA_WIDTH = 8,
+    parameter KEEP_ENABLE = (DATA_WIDTH>8),
+    parameter KEEP_WIDTH = (DATA_WIDTH/8),
+    parameter LAST_ENABLE = 1,
+    parameter ID_ENABLE = 0,
+    parameter ID_WIDTH = 8,
+    parameter DEST_WIDTH = {{cm}},
+    parameter USER_ENABLE = 1,
+    parameter USER_WIDTH = 1
+)
+(
+    input  wire                  clk,
+    input  wire                  rst,
+
+    /*
+     * AXI Stream inputs
+     */
+{%- for p in range(m) %}
+    input  wire [DATA_WIDTH-1:0] s{{'%02d'%p}}_axis_tdata,
+    input  wire [KEEP_WIDTH-1:0] s{{'%02d'%p}}_axis_tkeep,
+    input  wire                  s{{'%02d'%p}}_axis_tvalid,
+    input  wire                  s{{'%02d'%p}}_axis_tlast,
+    input  wire [ID_WIDTH-1:0]   s{{'%02d'%p}}_axis_tid,
+    input  wire [DEST_WIDTH-1:0] s{{'%02d'%p}}_axis_tdest,
+    input  wire [USER_WIDTH-1:0] s{{'%02d'%p}}_axis_tuser,
+{% endfor %}
+    /*
+     * AXI Stream outputs
+     */
+{%- for p in range(n) %}
+    output wire [DATA_WIDTH-1:0] m{{'%02d'%p}}_axis_tdata,
+    output wire [KEEP_WIDTH-1:0] m{{'%02d'%p}}_axis_tkeep,
+    output wire                  m{{'%02d'%p}}_axis_tvalid,
+    output wire                  m{{'%02d'%p}}_axis_tlast,
+    output wire [ID_WIDTH-1:0]   m{{'%02d'%p}}_axis_tid,
+    output wire [DEST_WIDTH-1:0] m{{'%02d'%p}}_axis_tdest,
+    output wire [USER_WIDTH-1:0] m{{'%02d'%p}}_axis_tuser{% if not loop.last %},{% endif %}
+{% endfor -%}
+);
+
+axis_crosspoint #(
+    .S_COUNT({{m}}),
+    .M_COUNT({{n}}),
+    .DATA_WIDTH(DATA_WIDTH),
+    .KEEP_ENABLE(KEEP_ENABLE),
+    .KEEP_WIDTH(KEEP_WIDTH),
+    .LAST_ENABLE(LAST_ENABLE),
+    .ID_ENABLE(ID_ENABLE),
+    .ID_WIDTH(ID_WIDTH),
+    .DEST_WIDTH(DEST_WIDTH),
+    .USER_ENABLE(USER_ENABLE),
+    .USER_WIDTH(USER_WIDTH)
+)
+axis_crosspoint_inst (
+    .clk(clk),
+    .rst(rst),
+    // AXI inputs
+    .s_axis_tdata({ {% for p in range(m-1,-1,-1) %}s{{'%02d'%p}}_axis_tdata{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tkeep({ {% for p in range(m-1,-1,-1) %}s{{'%02d'%p}}_axis_tkeep{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tvalid({ {% for p in range(m-1,-1,-1) %}s{{'%02d'%p}}_axis_tvalid{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tlast({ {% for p in range(m-1,-1,-1) %}s{{'%02d'%p}}_axis_tlast{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tid({ {% for p in range(m-1,-1,-1) %}s{{'%02d'%p}}_axis_tid{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tdest({ {% for p in range(m-1,-1,-1) %}s{{'%02d'%p}}_axis_tdest{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tuser({ {% for p in range(m-1,-1,-1) %}s{{'%02d'%p}}_axis_tuser{% if not loop.last %}, {% endif %}{% endfor %} }),
+    // AXI output
+    .m_axis_tdata({ {% for p in range(n-1,-1,-1) %}m{{'%02d'%p}}_axis_tdata{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .m_axis_tkeep({ {% for p in range(n-1,-1,-1) %}m{{'%02d'%p}}_axis_tkeep{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .m_axis_tvalid({ {% for p in range(n-1,-1,-1) %}m{{'%02d'%p}}_axis_tvalid{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .m_axis_tlast({ {% for p in range(n-1,-1,-1) %}m{{'%02d'%p}}_axis_tlast{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .m_axis_tid({ {% for p in range(n-1,-1,-1) %}m{{'%02d'%p}}_axis_tid{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .m_axis_tdest({ {% for p in range(n-1,-1,-1) %}m{{'%02d'%p}}_axis_tdest{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .m_axis_tuser({ {% for p in range(n-1,-1,-1) %}m{{'%02d'%p}}_axis_tuser{% if not loop.last %}, {% endif %}{% endfor %} })
+);
+
+endmodule
+
+""")
+
+    output_file.write(t.render(
+        m=m,
+        n=n,
+        cm=cm,
+        cn=cn,
+        name=name
+    ))
+
+    print("Done")
+
+if __name__ == "__main__":
+    main()
+
diff --git a/rtl/axis_demux_wrap.py b/rtl/axis_demux_wrap.py
new file mode 100755
index 000000000..c0554afb5
--- /dev/null
+++ b/rtl/axis_demux_wrap.py
@@ -0,0 +1,177 @@
+#!/usr/bin/env python
+"""
+Generates an AXI Stream demux wrapper with the specified number of ports
+"""
+
+from __future__ import print_function
+
+import argparse
+import math
+from jinja2 import Template
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__.strip())
+    parser.add_argument('-p', '--ports',  type=int, default=4, help="number of ports")
+    parser.add_argument('-n', '--name',   type=str, help="module name")
+    parser.add_argument('-o', '--output', type=str, help="output file name")
+
+    args = parser.parse_args()
+
+    try:
+        generate(**args.__dict__)
+    except IOError as ex:
+        print(ex)
+        exit(1)
+
+def generate(ports=4, name=None, output=None):
+    n = ports
+
+    if name is None:
+        name = "axis_demux_wrap_{0}".format(n)
+
+    if output is None:
+        output = name + ".v"
+
+    print("Opening file '{0}'...".format(output))
+
+    output_file = open(output, 'w')
+
+    print("Generating {0} port AXI stream demux wrapper {1}...".format(n, name))
+
+    cn = int(math.ceil(math.log(n, 2)))
+
+    t = Template(u"""/*
+
+Copyright (c) 2018 Alex Forencich
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+*/
+
+// Language: Verilog 2001
+
+`timescale 1ns / 1ps
+
+/*
+ * AXI4-Stream {{n}} port demux (wrapper)
+ */
+module {{name}} #
+(
+    parameter DATA_WIDTH = 8,
+    parameter KEEP_ENABLE = (DATA_WIDTH>8),
+    parameter KEEP_WIDTH = (DATA_WIDTH/8),
+    parameter ID_ENABLE = 0,
+    parameter ID_WIDTH = 8,
+    parameter DEST_ENABLE = 0,
+    parameter DEST_WIDTH = 8,
+    parameter USER_ENABLE = 1,
+    parameter USER_WIDTH = 1
+)
+(
+    input  wire                  clk,
+    input  wire                  rst,
+
+    /*
+     * AXI Stream input
+     */
+    input  wire [DATA_WIDTH-1:0] s_axis_tdata,
+    input  wire [KEEP_WIDTH-1:0] s_axis_tkeep,
+    input  wire                  s_axis_tvalid,
+    output wire                  s_axis_tready,
+    input  wire                  s_axis_tlast,
+    input  wire [ID_WIDTH-1:0]   s_axis_tid,
+    input  wire [DEST_WIDTH-1:0] s_axis_tdest,
+    input  wire [USER_WIDTH-1:0] s_axis_tuser,
+
+    /*
+     * AXI Stream outputs
+     */
+{%- for p in range(n) %}
+    output wire [DATA_WIDTH-1:0] m{{'%02d'%p}}_axis_tdata,
+    output wire [KEEP_WIDTH-1:0] m{{'%02d'%p}}_axis_tkeep,
+    output wire                  m{{'%02d'%p}}_axis_tvalid,
+    input  wire                  m{{'%02d'%p}}_axis_tready,
+    output wire                  m{{'%02d'%p}}_axis_tlast,
+    output wire [ID_WIDTH-1:0]   m{{'%02d'%p}}_axis_tid,
+    output wire [DEST_WIDTH-1:0] m{{'%02d'%p}}_axis_tdest,
+    output wire [USER_WIDTH-1:0] m{{'%02d'%p}}_axis_tuser,
+{% endfor -%}
+
+    /*
+     * Control
+     */
+    input  wire                  enable,
+    input  wire                  drop,
+    input  wire [{{cn-1}}:0]            select
+);
+
+axis_demux #(
+    .M_COUNT({{n}}),
+    .DATA_WIDTH(DATA_WIDTH),
+    .KEEP_ENABLE(KEEP_ENABLE),
+    .KEEP_WIDTH(KEEP_WIDTH),
+    .ID_ENABLE(ID_ENABLE),
+    .ID_WIDTH(ID_WIDTH),
+    .DEST_ENABLE(DEST_ENABLE),
+    .DEST_WIDTH(DEST_WIDTH),
+    .USER_ENABLE(USER_ENABLE),
+    .USER_WIDTH(USER_WIDTH)
+)
+axis_demux_inst (
+    .clk(clk),
+    .rst(rst),
+    // AXI inputs
+    .s_axis_tdata(s_axis_tdata),
+    .s_axis_tkeep(s_axis_tkeep),
+    .s_axis_tvalid(s_axis_tvalid),
+    .s_axis_tready(s_axis_tready),
+    .s_axis_tlast(s_axis_tlast),
+    .s_axis_tid(s_axis_tid),
+    .s_axis_tdest(s_axis_tdest),
+    .s_axis_tuser(s_axis_tuser),
+    // AXI output
+    .m_axis_tdata({ {% for p in range(n-1,-1,-1) %}m{{'%02d'%p}}_axis_tdata{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .m_axis_tkeep({ {% for p in range(n-1,-1,-1) %}m{{'%02d'%p}}_axis_tkeep{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .m_axis_tvalid({ {% for p in range(n-1,-1,-1) %}m{{'%02d'%p}}_axis_tvalid{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .m_axis_tready({ {% for p in range(n-1,-1,-1) %}m{{'%02d'%p}}_axis_tready{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .m_axis_tlast({ {% for p in range(n-1,-1,-1) %}m{{'%02d'%p}}_axis_tlast{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .m_axis_tid({ {% for p in range(n-1,-1,-1) %}m{{'%02d'%p}}_axis_tid{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .m_axis_tdest({ {% for p in range(n-1,-1,-1) %}m{{'%02d'%p}}_axis_tdest{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .m_axis_tuser({ {% for p in range(n-1,-1,-1) %}m{{'%02d'%p}}_axis_tuser{% if not loop.last %}, {% endif %}{% endfor %} }),
+    // Control
+    .enable(enable),
+    .drop(drop),
+    .select(select)
+);
+
+endmodule
+
+""")
+
+    output_file.write(t.render(
+        n=n,
+        cn=cn,
+        name=name
+    ))
+
+    print("Done")
+
+if __name__ == "__main__":
+    main()
+
diff --git a/rtl/axis_frame_join_wrap.py b/rtl/axis_frame_join_wrap.py
new file mode 100755
index 000000000..5a9b9b66f
--- /dev/null
+++ b/rtl/axis_frame_join_wrap.py
@@ -0,0 +1,155 @@
+#!/usr/bin/env python
+"""
+Generates an AXI Stream frame joiner wrapper with the specified number of ports
+"""
+
+from __future__ import print_function
+
+import argparse
+import math
+from jinja2 import Template
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__.strip())
+    parser.add_argument('-p', '--ports',  type=int, default=4, help="number of ports")
+    parser.add_argument('-n', '--name',   type=str, help="module name")
+    parser.add_argument('-o', '--output', type=str, help="output file name")
+
+    args = parser.parse_args()
+
+    try:
+        generate(**args.__dict__)
+    except IOError as ex:
+        print(ex)
+        exit(1)
+
+def generate(ports=4, name=None, output=None):
+    n = ports
+
+    if name is None:
+        name = "axis_frame_join_wrap_{0}".format(n)
+
+    if output is None:
+        output = name + ".v"
+
+    print("Opening file '{0}'...".format(output))
+
+    output_file = open(output, 'w')
+
+    print("Generating {0} port AXI stream frame joiner wrapper {1}...".format(n, name))
+
+    cn = int(math.ceil(math.log(n, 2)))
+
+    t = Template(u"""/*
+
+Copyright (c) 2018 Alex Forencich
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+*/
+
+// Language: Verilog 2001
+
+`timescale 1ns / 1ps
+
+/*
+ * AXI4-Stream {{n}} port frame joiner (wrapper)
+ */
+module {{name}} #
+(
+    parameter DATA_WIDTH = 8,
+    parameter TAG_ENABLE = 1,
+    parameter TAG_WIDTH = 16
+)
+(
+    input  wire                  clk,
+    input  wire                  rst,
+
+    /*
+     * AXI Stream inputs
+     */
+{%- for p in range(n) %}
+    input  wire [DATA_WIDTH-1:0] s{{'%02d'%p}}_axis_tdata,
+    input  wire                  s{{'%02d'%p}}_axis_tvalid,
+    output wire                  s{{'%02d'%p}}_axis_tready,
+    input  wire                  s{{'%02d'%p}}_axis_tlast,
+    input  wire                  s{{'%02d'%p}}_axis_tuser,
+{% endfor %}
+    /*
+     * AXI Stream output
+     */
+    output wire [DATA_WIDTH-1:0] m_axis_tdata,
+    output wire                  m_axis_tvalid,
+    input  wire                  m_axis_tready,
+    output wire                  m_axis_tlast,
+    output wire                  m_axis_tuser,
+
+    /*
+     * Configuration
+     */
+    input  wire [TAG_WIDTH-1:0]  tag,
+
+    /*
+     * Status signals
+     */
+    output wire                  busy
+);
+
+axis_frame_join #(
+    .S_COUNT({{n}}),
+    .DATA_WIDTH(DATA_WIDTH),
+    .TAG_ENABLE(TAG_ENABLE),
+    .TAG_WIDTH(TAG_WIDTH)
+)
+axis_frame_join_inst (
+    .clk(clk),
+    .rst(rst),
+    // AXI inputs
+    .s_axis_tdata({ {% for p in range(n-1,-1,-1) %}s{{'%02d'%p}}_axis_tdata{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tvalid({ {% for p in range(n-1,-1,-1) %}s{{'%02d'%p}}_axis_tvalid{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tready({ {% for p in range(n-1,-1,-1) %}s{{'%02d'%p}}_axis_tready{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tlast({ {% for p in range(n-1,-1,-1) %}s{{'%02d'%p}}_axis_tlast{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tuser({ {% for p in range(n-1,-1,-1) %}s{{'%02d'%p}}_axis_tuser{% if not loop.last %}, {% endif %}{% endfor %} }),
+    // AXI output
+    .m_axis_tdata(m_axis_tdata),
+    .m_axis_tvalid(m_axis_tvalid),
+    .m_axis_tready(m_axis_tready),
+    .m_axis_tlast(m_axis_tlast),
+    .m_axis_tuser(m_axis_tuser),
+    // Configuration
+    .tag(tag),
+    // Status
+    .busy(busy)
+);
+
+endmodule
+
+""")
+
+    output_file.write(t.render(
+        n=n,
+        cn=cn,
+        name=name
+    ))
+
+    print("Done")
+
+if __name__ == "__main__":
+    main()
+
diff --git a/rtl/axis_mux_wrap.py b/rtl/axis_mux_wrap.py
new file mode 100755
index 000000000..2274de981
--- /dev/null
+++ b/rtl/axis_mux_wrap.py
@@ -0,0 +1,174 @@
+#!/usr/bin/env python
+"""
+Generates an AXI Stream mux wrapper with the specified number of ports
+"""
+
+from __future__ import print_function
+
+import argparse
+import math
+from jinja2 import Template
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__.strip())
+    parser.add_argument('-p', '--ports',  type=int, default=4, help="number of ports")
+    parser.add_argument('-n', '--name',   type=str, help="module name")
+    parser.add_argument('-o', '--output', type=str, help="output file name")
+
+    args = parser.parse_args()
+
+    try:
+        generate(**args.__dict__)
+    except IOError as ex:
+        print(ex)
+        exit(1)
+
+def generate(ports=4, name=None, output=None):
+    n = ports
+
+    if name is None:
+        name = "axis_mux_wrap_{0}".format(n)
+
+    if output is None:
+        output = name + ".v"
+
+    print("Opening file '{0}'...".format(output))
+
+    output_file = open(output, 'w')
+
+    print("Generating {0} port AXI stream mux wrapper {1}...".format(n, name))
+
+    cn = int(math.ceil(math.log(n, 2)))
+
+    t = Template(u"""/*
+
+Copyright (c) 2018 Alex Forencich
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+*/
+
+// Language: Verilog 2001
+
+`timescale 1ns / 1ps
+
+/*
+ * AXI4-Stream {{n}} port mux (wrapper)
+ */
+module {{name}} #
+(
+    parameter DATA_WIDTH = 8,
+    parameter KEEP_ENABLE = (DATA_WIDTH>8),
+    parameter KEEP_WIDTH = (DATA_WIDTH/8),
+    parameter ID_ENABLE = 0,
+    parameter ID_WIDTH = 8,
+    parameter DEST_ENABLE = 0,
+    parameter DEST_WIDTH = 8,
+    parameter USER_ENABLE = 1,
+    parameter USER_WIDTH = 1
+)
+(
+    input  wire                  clk,
+    input  wire                  rst,
+
+    /*
+     * AXI Stream inputs
+     */
+{%- for p in range(n) %}
+    input  wire [DATA_WIDTH-1:0] s{{'%02d'%p}}_axis_tdata,
+    input  wire [KEEP_WIDTH-1:0] s{{'%02d'%p}}_axis_tkeep,
+    input  wire                  s{{'%02d'%p}}_axis_tvalid,
+    output wire                  s{{'%02d'%p}}_axis_tready,
+    input  wire                  s{{'%02d'%p}}_axis_tlast,
+    input  wire [ID_WIDTH-1:0]   s{{'%02d'%p}}_axis_tid,
+    input  wire [DEST_WIDTH-1:0] s{{'%02d'%p}}_axis_tdest,
+    input  wire [USER_WIDTH-1:0] s{{'%02d'%p}}_axis_tuser,
+{% endfor %}
+    /*
+     * AXI Stream output
+     */
+    output wire [DATA_WIDTH-1:0] m_axis_tdata,
+    output wire [KEEP_WIDTH-1:0] m_axis_tkeep,
+    output wire                  m_axis_tvalid,
+    input  wire                  m_axis_tready,
+    output wire                  m_axis_tlast,
+    output wire [ID_WIDTH-1:0]   m_axis_tid,
+    output wire [DEST_WIDTH-1:0] m_axis_tdest,
+    output wire [USER_WIDTH-1:0] m_axis_tuser,
+
+    /*
+     * Control
+     */
+    input  wire                  enable,
+    input  wire [{{cn-1}}:0]            select
+);
+
+axis_mux #(
+    .S_COUNT({{n}}),
+    .DATA_WIDTH(DATA_WIDTH),
+    .KEEP_ENABLE(KEEP_ENABLE),
+    .KEEP_WIDTH(KEEP_WIDTH),
+    .ID_ENABLE(ID_ENABLE),
+    .ID_WIDTH(ID_WIDTH),
+    .DEST_ENABLE(DEST_ENABLE),
+    .DEST_WIDTH(DEST_WIDTH),
+    .USER_ENABLE(USER_ENABLE),
+    .USER_WIDTH(USER_WIDTH)
+)
+axis_mux_inst (
+    .clk(clk),
+    .rst(rst),
+    // AXI inputs
+    .s_axis_tdata({ {% for p in range(n-1,-1,-1) %}s{{'%02d'%p}}_axis_tdata{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tkeep({ {% for p in range(n-1,-1,-1) %}s{{'%02d'%p}}_axis_tkeep{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tvalid({ {% for p in range(n-1,-1,-1) %}s{{'%02d'%p}}_axis_tvalid{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tready({ {% for p in range(n-1,-1,-1) %}s{{'%02d'%p}}_axis_tready{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tlast({ {% for p in range(n-1,-1,-1) %}s{{'%02d'%p}}_axis_tlast{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tid({ {% for p in range(n-1,-1,-1) %}s{{'%02d'%p}}_axis_tid{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tdest({ {% for p in range(n-1,-1,-1) %}s{{'%02d'%p}}_axis_tdest{% if not loop.last %}, {% endif %}{% endfor %} }),
+    .s_axis_tuser({ {% for p in range(n-1,-1,-1) %}s{{'%02d'%p}}_axis_tuser{% if not loop.last %}, {% endif %}{% endfor %} }),
+    // AXI output
+    .m_axis_tdata(m_axis_tdata),
+    .m_axis_tkeep(m_axis_tkeep),
+    .m_axis_tvalid(m_axis_tvalid),
+    .m_axis_tready(m_axis_tready),
+    .m_axis_tlast(m_axis_tlast),
+    .m_axis_tid(m_axis_tid),
+    .m_axis_tdest(m_axis_tdest),
+    .m_axis_tuser(m_axis_tuser),
+    // Control
+    .enable(enable),
+    .select(select)
+);
+
+endmodule
+
+""")
+
+    output_file.write(t.render(
+        n=n,
+        cn=cn,
+        name=name
+    ))
+
+    print("Done")
+
+if __name__ == "__main__":
+    main()
+