Refactoring - class separation (no pun intended).
gitignore vim swp.