BUG-1886: split static classes into separate files