moved classes from scope to utils