WIP
WIP
WIP
WIP
WIP
wip
Merge pull request #3 from mettienne/collection-restructure

WIP