Move cluster definition to it's old location

This should improve the diff slightly