Moving the rest of initizalization code into Bootstrap.java in preparation for the introduction of DI