External class files
Reorganization