Improve regexp and don't save 'gomi' directory