fix: fix circular dependencies in types