Fix module name
Move module Weight to separate file