Continue to modularize apu units