Consolidate scripts and contrib