Refactored to Core.
Renamed file.