Restructure
Comments added