Core loader adjusted

Renamed some classes and fixed Task initialization.