Restructure 2

Restructure 2