Classes were arranged into a few separate files