Start pulling non-library material out of core source files