restruture and improvements