Add gitignore, rename folders