Prepare for becoming the base repo
* Shuffle some definitions around
* Remove aries-isms

Change-Id: I9ac3640e9ae34ed717c70a423715f3970ff5b9a3