Reorganized modules and package structure