Reorganization towards modularization