Made the utility files sorted into folders.