Moving classes to dedicated files