Added ability to extract from folder resources as well. Bit of a hack right now, but will be cleaner later.