Refactoring and dependency fixes
3 files changed