Merge pull request #69 from webOS-ports/tofe/architecture

Tofe/architecture