Updated code and fixed export folder creating bugs.