Many changes in structure and so on...
Merge pull request #4 from scippio/master

Many changes in structure and so on...