Port module changes to main brackets repo