Restructure

WIP