Merge pull request #24 from imxerxes/master

continued file structure organisation and introduction of karma support