Moved unused classes, added correct PID class.