revise loader/moudle structure