Resturcture and added a draw script