Source now standalone, separated from immp-spec