Rearranged file grouping in project
.gitignore
project file changes