Update .gitignore and reorganize project.