simplified directory name generation
simplified regexps
cleanup testing
added more things to do ;-)