Refactored class names and fixed a dependency-selection bug. #994 (Clean up plugin infrastructure project)