Revise organization, separate classes into files