Reorganization

Added the first target-based filter and reorganized variable
definitions.