Changed title and moved collections to folder
Merge branch 'master' into di