Reorganized collection, tested, added distribute script.