.gitignore updated, repository structure fixed, so .gitignore can filter files
merge
merge