Changed file naming scheme
Fixed bug in regex
Removed date since is not needed