Restructured setup