Fix grep issue with backslashes and update package structure

Fix grep issue with backslashes and update package structure #409