Placed classes into separate files.