Changes in structure: encompass under 'federation' folder