Restructured example structure to match new structure