Major restructuring, switch to a modular system