Moving Twitter provider and formatting for PSR-2