Removed hierarchy from the core
Fixed package references in Native Client