Major refactoring. Added downloading bundles