Move class definitions into separate files