Updated build for new snapshot, plus re-organized deps