add .gitignore, reorganize