Improve gitignore setting and corresponding workspace files

The main change is .gitignore file.

All other changes are aligned with the modified .gitignore settings.

First clean up the workspace...