Some module restructuring.