Refactoring Pins; breaking into file per class. Large ripple effect.