Refactored classes out to separate files, and enhanced shuffle closure.