Merge pull request #61 from energee/master

System structure cleanup
Resolves issue #67