Moving files into more appropriately named classes