Added dependency from hc-core
Removed useless files