Modified location of utlility classes by refactoring them into concerns. Updated specs to accomidate.