Move entities and fix Service Manager facade