Restructuring phase 1.
Merge branch 'master' of https://www.github.com/cwi-swat/rascal