Further rearrangements of boot.js

Getting better..