directory structure cleanup
.gitignore update