Restructure EP

Restructure