Renamed to SIE, Moved Hilbert
Fixed namespace issues