Fixed file layout, added zipped archive

Better than previous layout