refactor spin files

Conflicts:
	spin/barrier.pml