Complete directories
FIX .gitignore conflict