fixed refactoring dependencies issues
10 files changed