Reorganizing code (1/2)
Broken up shim into smaller files