changed dir structure, updated .gitignore