Filename and module export restructuring.