Adding in solenoids and Feeder code. Refactored package names.