Restructure

re #237