added CDMIngest and moved model around