3.0.0
		Restructure layout