updated easier regEx and tests with subfolders

Signed-off-by: Andreas Geibert <ageibert@cemico.de>