extract some class to its own file