Reorganize, add .gitignore