Update 3

I completely reorganized all of the files and have something for wines
and locations