Merge "Move nested classes out of Tuner.java"