goodbye, old logic backup. You won't be missed.
Some restructuring/renaming for consistency