restructure

to hopefully fix compilation problem!