New modular structure proposal (master)