Make conditions share declarations.
Move couple classes around.