Fix gitignore and add new data dirs