separating modules
Merge pull request #29 from LauraHilliger/master

separating modules