Break classes into dedicated files.
Fix compiler crash.