Moved all files in top-level package into util