Moved unused classes out of Mac folder