Restructure
updated