Move Core files outside of Core directory