Restructure to clean up

Restructure to clean up