Fix async file loading bug
Move services to Engine