Move classes to separate files.
Remove some earlier changes.
Revert changes.