Separate static classes into their own files