Sprint 3 - Modular structure update