Use subfolder for temp directory
Rearranged method ordering