Further clean-up and renaming

* This library should be required as 'occi-core'
  from now on