Made BootContext a little neater and fixed exe build which referenced wrong class