Move infrastructure to bundle
Refactoring infrastructure
Merge branch 'refactoring-infrastructure'