reorganized classes/interfaces in the contracts assembly; refactored bootstrap related classes;