move an inner class in a new file.
Merge branch 'master' into production