fix(npm): Remove circular dependencies