modified the definiations
fixed typo in defined constants
added submodule hybrid-core