updated the folder path
Cleaned up code a lot, using fetchConfig() for vars