Reformat modules to use amd filter