Some new directories and .gitignore tweeks