Restructered the returns to nested sets and maps.
Merge branch 'master' of https://github.com/sancarbar/rascal-android