Restructure + Beginning of UI