Update .gitignore, reorder the source files