src/core clean up

not done, but alot of the mods are reduced down.. next comes code clean
up for this directory