Move private classes into their own file