Restructure; Begin formalization