Moved utils.
And added missing files.