File Reorganization and Better Classes