Fixed problems with base dir. instead of copying the dir we are now copying just it's contents.