Moved file utils to own module