Doing some decomposition in smaller files