move core files into widespread for testing