Reorganize into small modules