Passed command blocks to the ModelConstructor

Passed to the model constructor instead of to the menu. This allows for
independent representation of the blocks.
Shuffled code.

Passed the calibration blocks to the calibrator instead of storing it.
Fixed enum

Spelling that differed broke java
Fixed general errors

Using fiducialID in stead of blockID.
Fixed the data counter - now using index