Added initial folder check

Needs to be tested.  Also needs to be reorganized so that we store the
destination folder at a more global level.