Fix folder create logic

Now new folders will only be made if necessary and old folders as specified by -o will not be emptied before use (with within logic).