Reorganize pluggable modules