Renamed collections to folders
Fixed ordering of oae packages in package.json
Merge branch 'master' of https://github.com/oaeproject/Hilary