Refactoring, add dependency-bundle, dependency-bundle-with-artifact