Consolidate scripts and contrib

Dang it!