organizational changes
Merge pull request #3 from klavs/master

organizational changes