restructured files, updated dice methods