Fix box name addresses
Move BitTable2 to a file