Updating utility import partial
Renaming utility files