api key and url support. naming and file organization updated