Bug Fix, allow for alternate folders to be used.