Move stuff out of root rapture package