Progress on refactoring and organizing dependency code.