Merge pull request #8 from 30x/apid-build

Refactor apid -> apid-core