Removed dependency on numerical pattern for folder name