eos restructuring for performance reasons

Only SLB is working for now.