Module reorganization