Restructure

Various structural changes