2267 Commits (refactor/extensions-package-structure)