Updating directory structure and .gitignore