Resolving Circular Dependencies

Refactor code architectures to eliminate circular dependencies that crash the container.