Restructure

Sorry for the inconvenience.