Renamed some core files, removed auto load references to self to stop cyclical references