Merge pull request #27 from LauraHilliger/master

reorg + cleaning up language, naming and instructions
separating modules