Cleanup.
Move Tx to its own file.