refactor core/adapter
Merge pull request #136 from patriot1burke/master

refactor core/adapter