improved regex
Migrated to new dir structure