Move some utility-like things into utils subdirectory