Bugfix && better code

This release fixes a major bug in the code (essentially a functions parameter was named "storefront" but I used "country" in the code)
Also adds some code revamps, essentially made a part of the code a module