Moved the marriage 'plugin' to the correct package and removed the useless stringutils