Update imports
Missing imports
Remove DateTime (unused, and needless dep on external datetime module)
Break bundle out into its own file
Remove yay reference