Changed exported directory structure so each recipient has a dir.
improved DRY in badge class code.