Reorganize Vanilla Module.