Upgraded packages. Refactored bootstrapper into separate source file.