Removed unneeded base folder name support