Restructured files & folders

There were duplicate files and some extra nesting in the .zip
package I downloaded from the original maintainer.