Restructure

Restructure committed file