Restructure the module headers: Parameters inside class