Moved util methods to Utils folder