Added *.swp to .gitignore
Made everything more modular.