Restructured ECS system