Renamed collections to folders
Fixed ordering of oae packages in package.json