modify gitignore and modify the layout