Update the framework detector
Split files out to core directory