Gitignore and Some Refactoring.