Renamed classes to use Core instead of Asset