Fixed some design issues.
Extended .gitignore