Moved mechine related classes to core.

Modified hierarchy of machine block, extracted BlockJaffas to a trait.